From: friendica <info@friendica.com>
Date: Thu, 23 May 2013 05:32:18 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ec14d06647cc4cf5c4cbcdddc1e65e6b3aaf1fd1;p=friendica.git

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

ec14d06647cc4cf5c4cbcdddc1e65e6b3aaf1fd1