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

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

a26b4e8af183ccf3f1b63b7b36f2081efef84a81