From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Jun 2010 17:34:00 +0000 (-0700)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5a96b9e8052361f8eddecc56decd68d4611ccc19;p=quix0rs-gnu-social.git

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

5a96b9e8052361f8eddecc56decd68d4611ccc19