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

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

26db26d13a6e13620fe37f51a6d1192b3a630b49