From: Friendika <info@friendika.com>
Date: Mon, 24 Oct 2011 02:06:04 +0000 (-0700)
Subject: Merge branch 'master' into tag
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fe2c8a18454253df09f20c8821d7d6e14c0ea8e0;p=friendica.git

Merge branch 'master' into tag
---

fe2c8a18454253df09f20c8821d7d6e14c0ea8e0