From: friendica <info@friendica.com>
Date: Mon, 21 May 2012 23:43:07 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9ca3ac6e61ff57a2bc615b133a64b0a7f66b3c41;p=friendica.git

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

9ca3ac6e61ff57a2bc615b133a64b0a7f66b3c41