From: friendica <info@friendica.com>
Date: Sun, 10 Jun 2012 08:00:16 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=64b4bbd65d9f9c956ffffe84215ce547d3b61512;p=friendica.git

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

64b4bbd65d9f9c956ffffe84215ce547d3b61512