From: Evan Prodromou <evan@status.net>
Date: Sun, 22 Jan 2012 02:12:53 +0000 (-0500)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=259a262df42b039be144dc2f1fd9a239659efdb1;p=quix0rs-gnu-social.git

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

259a262df42b039be144dc2f1fd9a239659efdb1