From: Evan Prodromou <evan@status.net>
Date: Sat, 28 Jul 2012 17:59:40 +0000 (-0400)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=330041e8bfd91f0b9ba3f11a957a6b1be93c631e;p=quix0rs-gnu-social.git

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

330041e8bfd91f0b9ba3f11a957a6b1be93c631e