From: friendica <info@friendica.com>
Date: Sat, 16 Feb 2013 01:41:42 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bc03bb5a4a76363b59cb6b20b17f8b79db122b22;p=friendica.git

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

bc03bb5a4a76363b59cb6b20b17f8b79db122b22