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

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

e68d2c9015ca48890ba125e61c698160a1846a72