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

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

c7f3e626d0bb141be86a8af6ffbe40768bc23069