From: friendica <info@friendica.com>
Date: Sun, 4 Nov 2012 21:43:42 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1d91b2d1b3d1e24565cfc39bec5ac25b5a1e340d;p=friendica.git

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

1d91b2d1b3d1e24565cfc39bec5ac25b5a1e340d