From: Evan Prodromou <evan@status.net>
Date: Fri, 4 Jun 2010 17:26:25 +0000 (-0400)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cbdeb6fb8f663bb3be5c161e1c605f12fc4878a6;p=quix0rs-gnu-social.git

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

cbdeb6fb8f663bb3be5c161e1c605f12fc4878a6