From: Evan Prodromou <evan@status.net>
Date: Tue, 23 Aug 2011 17:32:24 +0000 (-0400)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fbed85e86838f181274b8173cddae6cfcc942bb4;p=quix0rs-gnu-social.git

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

fbed85e86838f181274b8173cddae6cfcc942bb4