From: friendica <info@friendica.com>
Date: Wed, 23 May 2012 01:06:34 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0da20ec9ef443edd86119601e39c42f78dc1a52f;p=friendica.git

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

0da20ec9ef443edd86119601e39c42f78dc1a52f