From: friendica <info@friendica.com>
Date: Thu, 13 Jun 2013 04:42:20 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=efce5ae1b9c142092ae878dded34e83b336d42f8;p=friendica.git

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

efce5ae1b9c142092ae878dded34e83b336d42f8