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

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

c12ec1116b54f0f39697099a583bb82150a8b703