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

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

faedddaa817cde70c8ab55803e68454d126e5936