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

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

c2738762986ba907b8abb1faeeb7865d561e9167