From: friendica <info@friendica.com>
Date: Sat, 28 Jul 2012 00:53:35 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eafec44793d266b7788e55982ef47add303c887d;p=friendica.git

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

eafec44793d266b7788e55982ef47add303c887d