From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 21:55:54 +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=ed8a1e6fe1827ebe920be03274de89f311684a11;p=quix0rs-gnu-social.git

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

ed8a1e6fe1827ebe920be03274de89f311684a11