From: friendica <info@friendica.com>
Date: Thu, 4 Apr 2013 22:13:06 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=61bff09ecd2ff59d7c4434fd9e977a0cdd075f4c;p=friendica.git

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

61bff09ecd2ff59d7c4434fd9e977a0cdd075f4c