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

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

a292629215004bcb0edc6f4fdfbf3317d96ea7d0