From: friendica <info@friendica.com>
Date: Sat, 12 May 2012 08:28:04 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=99e4ea19e733f86259e39f5a22d64f1521abc5ae;p=friendica.git

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

99e4ea19e733f86259e39f5a22d64f1521abc5ae