From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 21:52:16 +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=341b935acc0111bc2bfa69be5687c4e6f255d8ce;p=quix0rs-gnu-social.git

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

341b935acc0111bc2bfa69be5687c4e6f255d8ce