From: friendica <info@friendica.com>
Date: Fri, 13 Jul 2012 05:49:50 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=644b18eb2cbb3a2117e3a31102bf085096ce0d91;p=friendica.git

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

644b18eb2cbb3a2117e3a31102bf085096ce0d91