From: Evan Prodromou <evan@status.net>
Date: Mon, 11 Apr 2011 20:50:13 +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=43646caf30cd78facaa76c2c95a3078cb2c3988e;p=quix0rs-gnu-social.git

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

43646caf30cd78facaa76c2c95a3078cb2c3988e