From: friendica <info@friendica.com>
Date: Fri, 13 Apr 2012 21:44:57 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e71f01b54946391c4c577f2570bb7121c95e0988;p=friendica.git

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

e71f01b54946391c4c577f2570bb7121c95e0988