From: friendica <info@friendica.com>
Date: Tue, 22 May 2012 05:56:39 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=02502c3a7460a1af3414b65232fd7c672a76d941;p=friendica.git

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

02502c3a7460a1af3414b65232fd7c672a76d941