From: friendica <info@friendica.com>
Date: Wed, 29 Aug 2012 03:35:25 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=af789ee98bc70ac7b574b0253a4b921a81bb69d5;p=friendica.git

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

af789ee98bc70ac7b574b0253a4b921a81bb69d5