From: friendica <info@friendica.com>
Date: Tue, 15 May 2012 03:36:27 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c53674d367513e2c24a8a483f672e345b6ed0bf5;p=friendica.git

Merge https://github.com/friendica/friendica into pull
---

c53674d367513e2c24a8a483f672e345b6ed0bf5