From: friendica <info@friendica.com>
Date: Fri, 11 May 2012 10:42:05 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7600b9b1eee6fc1bab72ce121681b0f9c0b8eb80;p=friendica.git

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

7600b9b1eee6fc1bab72ce121681b0f9c0b8eb80