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

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

08b3126dae0cb93c3ea5ae47629ab8e6f7c37143