From: Brion Vibber <brion@pobox.com>
Date: Fri, 21 May 2010 20:12:25 +0000 (-0700)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?p=quix0rs-gnu-social.git;a=commitdiff_plain;h=87b8a89aa7b96e63586bdd3b1afb9d43355fd48b

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

87b8a89aa7b96e63586bdd3b1afb9d43355fd48b