From: friendica <info@friendica.com>
Date: Mon, 28 May 2012 23:52:19 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=10a057b97959d5915c9eab1947bea7b039d3218b;p=friendica.git

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

10a057b97959d5915c9eab1947bea7b039d3218b