From: friendica <info@friendica.com>
Date: Thu, 26 Apr 2012 08:34:21 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bf97ad201051da76a8d1355a03ec3e1efad0a68b;p=friendica.git

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

bf97ad201051da76a8d1355a03ec3e1efad0a68b