From: Evan Prodromou <evan@status.net>
Date: Sat, 11 Dec 2010 16:01:05 +0000 (-0500)
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=af4ee1d490b86e5d50cfcb62db3b886c9305da8c;p=quix0rs-gnu-social.git

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

af4ee1d490b86e5d50cfcb62db3b886c9305da8c