From: friendica <info@friendica.com>
Date: Tue, 24 Apr 2012 05:42:48 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7923404c836979f5da7bd7ab47b1d93d137af1cc;p=friendica.git

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

7923404c836979f5da7bd7ab47b1d93d137af1cc