From: Evan Prodromou <evan@status.net>
Date: Sat, 1 May 2010 14:47:30 +0000 (-0400)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=28fe1c2f3c814ec6a578b0e49acaa27e9cf88a19;p=quix0rs-gnu-social.git

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

28fe1c2f3c814ec6a578b0e49acaa27e9cf88a19