From: Brion Vibber <brion@pobox.com>
Date: Wed, 19 May 2010 22:46:39 +0000 (-0700)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ad651c35353021d05ef4a013e57c17d0b885c5dc;p=quix0rs-gnu-social.git

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

ad651c35353021d05ef4a013e57c17d0b885c5dc