From: friendica <info@friendica.com>
Date: Sat, 19 May 2012 07:46:49 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a49bd0a6866a911d9d3c7a6df9a2cd23827a804f;p=friendica.git

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

a49bd0a6866a911d9d3c7a6df9a2cd23827a804f