From: friendica <info@friendica.com>
Date: Sat, 18 Aug 2012 05:07:12 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=22bf48cae90a2c092983517b1bca3336a5736e1d;p=friendica.git

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

22bf48cae90a2c092983517b1bca3336a5736e1d