From: friendica <info@friendica.com>
Date: Thu, 2 Aug 2012 08:24:04 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9885be256ea0b1506d19e16b1d7f32241485a4ce;p=friendica.git

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

9885be256ea0b1506d19e16b1d7f32241485a4ce