From: Evan Prodromou <evan@status.net>
Date: Thu, 17 Mar 2011 15:32:37 +0000 (-0400)
Subject: Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1a666f07129837cfed420ea54e0f57e2b13f8815;p=quix0rs-gnu-social.git

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

1a666f07129837cfed420ea54e0f57e2b13f8815