From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 23:08:50 +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=0182b96f7cd1b03f740fe6ed788a0cf36d1b8487;p=quix0rs-gnu-social.git

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

0182b96f7cd1b03f740fe6ed788a0cf36d1b8487