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

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

a3a55897e5c8dc834d72cf66d705599ed990fa87