From: friendica <info@friendica.com>
Date: Sun, 13 May 2012 05:20:03 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eaf028c9fb5c3eefc7dd7d4e4b1c4308cb071137;p=friendica.git

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

eaf028c9fb5c3eefc7dd7d4e4b1c4308cb071137