From: Brion Vibber <brion@pobox.com>
Date: Sun, 11 Apr 2010 00:54:37 +0000 (-0700)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=edd883d3b009788049a9326bd6bdcc7846f87a8a;p=quix0rs-gnu-social.git

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

edd883d3b009788049a9326bd6bdcc7846f87a8a