From: friendica <info@friendica.com>
Date: Thu, 28 Jun 2012 23:05:28 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d7f35c81db264c3cbf3696a21d67b17f6aab8b09;p=friendica.git

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

d7f35c81db264c3cbf3696a21d67b17f6aab8b09