From: Evan Prodromou <evan@status.net>
Date: Sat, 27 Aug 2011 15:29:26 +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=bce337e7c31c2badf34a3af99da6fc2158eedddd;p=quix0rs-gnu-social.git

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

bce337e7c31c2badf34a3af99da6fc2158eedddd