From: Evan Prodromou <evan@status.net>
Date: Fri, 8 Jul 2011 14:18:16 +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=41c2102d0bea9b5b865d0edc40fcfa71493e5907;p=quix0rs-gnu-social.git

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

41c2102d0bea9b5b865d0edc40fcfa71493e5907