From: friendica <info@friendica.com>
Date: Fri, 3 May 2013 04:42:54 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2a3288b01e48ce3c9e2ea2860e317cb9f8a42001;p=friendica.git

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

2a3288b01e48ce3c9e2ea2860e317cb9f8a42001