From: friendica <info@friendica.com>
Date: Sat, 3 Nov 2012 21:44:46 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f076d7f0dc3619604872c48f41f66e3fa4c4af79;p=friendica.git

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

f076d7f0dc3619604872c48f41f66e3fa4c4af79