From: Samantha Doherty <sammy@status.net>
Date: Sat, 27 Aug 2011 11:58:58 +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=38eefd1b329f0f2b991427c704185e954f4a3ce3;p=quix0rs-gnu-social.git

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

38eefd1b329f0f2b991427c704185e954f4a3ce3