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

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

49cd3f615d83cbb9eac01a39b16d121cab86bc8e