From: Brion Vibber <brion@pobox.com>
Date: Sat, 26 Jun 2010 19:09:08 +0000 (-0400)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ef7e85c0ab79dcac5239aaee2e3f329588db6397;p=quix0rs-gnu-social.git

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

ef7e85c0ab79dcac5239aaee2e3f329588db6397