From: friendica <info@friendica.com>
Date: Sun, 2 Sep 2012 08:48:24 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=115310f1f45124d7c2a0788adf5112ce0f60d3a3;p=friendica.git

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

115310f1f45124d7c2a0788adf5112ce0f60d3a3