From: Evan Prodromou <evan@status.net>
Date: Thu, 21 Apr 2011 19:23:22 +0000 (-0400)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=963d05265301c71138f9bb9bf08bab70a17419f1;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
---

963d05265301c71138f9bb9bf08bab70a17419f1