From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Jun 2010 18:50:52 +0000 (-0400)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=135b398d4bfd1d680c5ea3600337f79c113ed681;p=quix0rs-gnu-social.git

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

135b398d4bfd1d680c5ea3600337f79c113ed681