From: Samantha Doherty <sammy@status.net>
Date: Sat, 17 Sep 2011 22:27:30 +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=95e76bf21aaa43aaac0ab71814de2faf4a060877;p=quix0rs-gnu-social.git

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

95e76bf21aaa43aaac0ab71814de2faf4a060877