From: Evan Prodromou <evan@status.net>
Date: Thu, 8 Apr 2010 16:16:31 +0000 (-0400)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8ec7ebbeac157284cc87369da54f3a762c9c4c27;p=quix0rs-gnu-social.git

Merge branch 'master' of gitorious.org:statusnet/mainline
---

8ec7ebbeac157284cc87369da54f3a762c9c4c27