From: friendica <info@friendica.com>
Date: Sat, 19 Jan 2013 01:38:56 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=83448507b8f8a72f07a87225089a0b07dc4ad76d;p=friendica.git

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

83448507b8f8a72f07a87225089a0b07dc4ad76d