From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Sep 2011 19:06:49 +0000 (-0400)
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=a19b194a31b6b2302d054db32c37b5b25462f197;p=quix0rs-gnu-social.git

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

a19b194a31b6b2302d054db32c37b5b25462f197