From: Samantha Doherty <sammy@status.net>
Date: Tue, 26 Jul 2011 19:21:40 +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=4fa286801e3ecbe07568a03c7b625f6749b771e8;p=quix0rs-gnu-social.git

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

4fa286801e3ecbe07568a03c7b625f6749b771e8