From: friendica <info@friendica.com>
Date: Tue, 26 Jun 2012 01:16:55 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=53f0aee82d61b7d61fb2271eb7f41cacc2eaf8f3;p=friendica.git

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

53f0aee82d61b7d61fb2271eb7f41cacc2eaf8f3