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

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

ffd5217ffaab826eb7f16c112a9f39b548298b81