From: Samantha Doherty <sammy@status.net>
Date: Wed, 13 Jul 2011 22:10: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=e7bbe6c1b664d579622d4103293b99e2650a6b8a;p=quix0rs-gnu-social.git

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

e7bbe6c1b664d579622d4103293b99e2650a6b8a