From: friendica <info@friendica.com>
Date: Thu, 9 Aug 2012 22:33:22 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=66e8e91646bb2e75881cab0085b4165bbe8e8fc9;p=friendica.git

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

66e8e91646bb2e75881cab0085b4165bbe8e8fc9