From: Evan Prodromou <evan@status.net>
Date: Wed, 29 Dec 2010 22:53:38 +0000 (-0800)
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=26afe79ed9ec8d17de829ee724e2c5b33f44a658;p=quix0rs-gnu-social.git

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

26afe79ed9ec8d17de829ee724e2c5b33f44a658