From: friendica <info@friendica.com>
Date: Mon, 3 Dec 2012 08:44:37 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=531fbff90b59ce11c860d2509925d8eb83235dfa;p=friendica.git

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

531fbff90b59ce11c860d2509925d8eb83235dfa