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

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

6914bdce178e14cbdd834b286c35cd3f0bac7268