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

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

f03ac60725c84653cf3965dac38b9fe1a8ab1a56