From: friendica <info@friendica.com>
Date: Mon, 25 Jun 2012 22:34:57 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=89ad19ce01f396ca71f4a991699871b26cf90b29;p=friendica.git

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

89ad19ce01f396ca71f4a991699871b26cf90b29