From: friendica <info@friendica.com>
Date: Mon, 14 Jan 2013 23:51:31 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=917acd6eb7892ba62060adc58b8937d7d8a7b709;p=friendica.git

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

917acd6eb7892ba62060adc58b8937d7d8a7b709