From: Evan Prodromou <evan@status.net>
Date: Thu, 5 May 2011 21:45:50 +0000 (-0700)
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=e863903263d4657ec8e4e56d5bd25bea9b40af29;p=quix0rs-gnu-social.git

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

e863903263d4657ec8e4e56d5bd25bea9b40af29