From: friendica <info@friendica.com>
Date: Wed, 23 May 2012 23:58:58 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5d06e0060d2bdff777d357e9bc22cd58f01aba53;p=friendica.git

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

5d06e0060d2bdff777d357e9bc22cd58f01aba53