From: friendica <info@friendica.com>
Date: Thu, 12 Apr 2012 23:13:10 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=15e74402d45b7a3b7453fd61c41ccc0696a04517;p=friendica.git

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

15e74402d45b7a3b7453fd61c41ccc0696a04517