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

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

f07658accf3baa162c9757e34dcab3b1c1abe3b6