From: Evan Prodromou <evan@status.net>
Date: Tue, 5 Apr 2011 17:47:07 +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=d09995561dc2b63dc63d537fce922237bfbde9f1;p=quix0rs-gnu-social.git

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

d09995561dc2b63dc63d537fce922237bfbde9f1