From: friendica <info@friendica.com>
Date: Wed, 5 Sep 2012 23:27:30 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f7c4b033c722c5985ad1850b0ad213e7ce362d78;p=friendica.git

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

f7c4b033c722c5985ad1850b0ad213e7ce362d78