From: Evan Prodromou <evan@status.net>
Date: Sat, 26 Nov 2011 15:21:12 +0000 (-0500)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=600a718a3374f93aa3ea00f8d684b3c205f9c76a;p=quix0rs-gnu-social.git

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

600a718a3374f93aa3ea00f8d684b3c205f9c76a