From: friendica <info@friendica.com>
Date: Sun, 23 Dec 2012 06:59:37 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=453082516e90aba59553fd4392b2cdfed6ae9a57;p=friendica.git

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

453082516e90aba59553fd4392b2cdfed6ae9a57