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

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

08c9185a7e091aa8ddc64da0935945d7cf04c348