From: friendica <info@friendica.com>
Date: Mon, 19 Nov 2012 07:50:37 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f1c579e74a438bfab6dce15c6bbe0075084bbf68;p=friendica.git

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

f1c579e74a438bfab6dce15c6bbe0075084bbf68