From: friendica <info@friendica.com>
Date: Sat, 4 Aug 2012 01:34:00 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bceae7b4c09f1e382b6f2c7f4e77cd69a4371124;p=friendica.git

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

bceae7b4c09f1e382b6f2c7f4e77cd69a4371124