From: Brion Vibber <brion@pobox.com>
Date: Thu, 14 Jan 2010 07:39:39 +0000 (-0800)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f4b47c7e641019a6027be7cdc231a893a368b4db;p=quix0rs-gnu-social.git

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

f4b47c7e641019a6027be7cdc231a893a368b4db