From: Brion Vibber <brion@pobox.com>
Date: Thu, 30 Sep 2010 18:31:29 +0000 (-0700)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=20f2167425fcbdca3281960297a0a006f4efbddf;p=quix0rs-gnu-social.git

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

20f2167425fcbdca3281960297a0a006f4efbddf