From: friendica <info@friendica.com>
Date: Fri, 19 Apr 2013 11:52:20 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=65e0cbd730271863e0ea533d7b4ad9a0cc74df0b;p=friendica.git

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

65e0cbd730271863e0ea533d7b4ad9a0cc74df0b