From: friendica <info@friendica.com>
Date: Wed, 15 Aug 2012 10:01:23 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=10585ec24f89838bf7c02d182353ec43e8ffa7f0;p=friendica.git

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

10585ec24f89838bf7c02d182353ec43e8ffa7f0