From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Feb 2010 19:57:21 +0000 (-0800)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b7037a49af97db73b3adc77d3f78ffb0805c7c68;p=quix0rs-gnu-social.git

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

b7037a49af97db73b3adc77d3f78ffb0805c7c68