From: Evan Prodromou <evan@status.net>
Date: Thu, 26 Jan 2012 16:04:54 +0000 (-0500)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=108d5d8d1715a79fbabc3c2cf185293d084c706b;p=quix0rs-gnu-social.git

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

108d5d8d1715a79fbabc3c2cf185293d084c706b