From: Zach Copley <zach@status.net>
Date: Fri, 1 Oct 2010 18:13:28 +0000 (-0700)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1a870e8ac63db53180d2182ef2b0800c3d543144;p=quix0rs-gnu-social.git

Merge branch 'master' of gitorious.org:statusnet/mainline
---

1a870e8ac63db53180d2182ef2b0800c3d543144