From: friendica <info@friendica.com>
Date: Sat, 29 Dec 2012 10:36:19 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f962ecdd6483679879d7608a47dbf8549a431a8f;p=friendica.git

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

f962ecdd6483679879d7608a47dbf8549a431a8f