From: friendica <info@friendica.com>
Date: Wed, 4 Jul 2012 04:41:05 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=13b4962531ca3c4f085b385a2c6b8f088abb7d6a;p=friendica.git

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

13b4962531ca3c4f085b385a2c6b8f088abb7d6a