From: Evan Prodromou <evan@status.net>
Date: Wed, 22 Dec 2010 20:03:14 +0000 (-0800)
Subject: Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a01742244e192bf8a251f8e11404a4d56364b87b;p=quix0rs-gnu-social.git

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

a01742244e192bf8a251f8e11404a4d56364b87b