From: Brion Vibber <brion@pobox.com>
Date: Tue, 4 May 2010 16:15:37 +0000 (-0700)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b29984361804f4775e3ec94d910b4a546dbe7b1e;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
---

b29984361804f4775e3ec94d910b4a546dbe7b1e