From: friendica <info@friendica.com>
Date: Sun, 15 Jul 2012 21:23:43 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c4643df01b537a1daa6f673a989f88d9f9c44317;p=friendica.git

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

c4643df01b537a1daa6f673a989f88d9f9c44317