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

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

a020e230860358fc8b63cd56872bbad0446016e0