From: Brion Vibber <brion@pobox.com>
Date: Thu, 4 Feb 2010 21:11:41 +0000 (-0800)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ed8553eea8b308ae0e686fdf96d3e209e83be28c;p=quix0rs-gnu-social.git

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

ed8553eea8b308ae0e686fdf96d3e209e83be28c