From: friendica <info@friendica.com>
Date: Sun, 15 Apr 2012 12:12:14 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=97715c73fcb5b6de582f7165f70526acaf24bc86;p=friendica.git

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

97715c73fcb5b6de582f7165f70526acaf24bc86