From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 26 Jun 2010 19:11:48 +0000 (-0700)
Subject: Merge remote branch 'statusnet/1.0.x' into msn-plugin
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f122d0b660e392fe5ce28a4ec14db6d45bd6b017;p=quix0rs-gnu-social.git

Merge remote branch 'statusnet/1.0.x' into msn-plugin
---

f122d0b660e392fe5ce28a4ec14db6d45bd6b017