From: friendica <info@friendica.com>
Date: Sat, 15 Sep 2012 22:24:28 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ee5ed6b9630b4369c951caec18acbc1a6b3aa361;p=friendica.git

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

ee5ed6b9630b4369c951caec18acbc1a6b3aa361