From: Evan Prodromou <evan@status.net>
Date: Fri, 10 Jun 2011 20:50:33 +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=c227045975905ba0cb690af95baf2cc471974105;p=quix0rs-gnu-social.git

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

c227045975905ba0cb690af95baf2cc471974105