From: friendica <info@friendica.com>
Date: Fri, 21 Jun 2013 12:02:43 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=407473f2ce23d3db352c02895ef4d55ddb69eb7e;p=friendica.git

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

407473f2ce23d3db352c02895ef4d55ddb69eb7e