From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 18 Mar 2011 15:09:27 +0000 (+0100)
Subject: Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b7178d2197d225b5fcb605b1c4d9df14d8b278a1;p=quix0rs-gnu-social.git

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

b7178d2197d225b5fcb605b1c4d9df14d8b278a1