From: friendica <info@friendica.com>
Date: Tue, 1 May 2012 06:08:31 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f175af05f92384fab7adb75390a8aa52dc1bd7e1;p=friendica.git

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

f175af05f92384fab7adb75390a8aa52dc1bd7e1