From: Ian Denhardt <ian@zenhack.net>
Date: Mon, 28 Mar 2011 07:25:40 +0000 (-0400)
Subject: Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d36f0707a488b6e2513193a0a2f72811435553ec;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
---

d36f0707a488b6e2513193a0a2f72811435553ec