From: friendica <info@friendica.com>
Date: Wed, 20 Jun 2012 12:06:20 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0d0f129d045e7a25d750c9eb2995d488678986e5;p=friendica.git

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

0d0f129d045e7a25d750c9eb2995d488678986e5