From: friendica <info@friendica.com>
Date: Fri, 5 Oct 2012 09:10:48 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c4b3ea3a73b816ca26e537feff772981390c82ec;p=friendica.git

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

c4b3ea3a73b816ca26e537feff772981390c82ec