From: Evan Prodromou <evan@status.net>
Date: Wed, 13 Feb 2013 15:01:23 +0000 (-0500)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cc8594748023aceb2b4d02d1baa3687fbc34b0f9;p=quix0rs-gnu-social.git

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

cc8594748023aceb2b4d02d1baa3687fbc34b0f9