From: Samantha Doherty <sammy@status.net>
Date: Fri, 26 Aug 2011 16:52:18 +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=2601b57505bf527a06d577ce6662e91c20fbf1fd;p=quix0rs-gnu-social.git

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

2601b57505bf527a06d577ce6662e91c20fbf1fd