From: Samantha Doherty <sammy@status.net>
Date: Fri, 19 Aug 2011 17:02:32 +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=1b7d1d9a4a41fe68f2ee2c31721a7e99da5a8cc6;p=quix0rs-gnu-social.git

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

1b7d1d9a4a41fe68f2ee2c31721a7e99da5a8cc6