From: friendica <info@friendica.com>
Date: Wed, 16 May 2012 20:55:00 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f5f345d388c9f1f0a47bad75c933d1bfe723773d;p=friendica.git

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

f5f345d388c9f1f0a47bad75c933d1bfe723773d