From: Beanow <beanow@oscp.info>
Date: Sun, 22 Mar 2015 14:13:30 +0000 (+0100)
Subject: Merge branch 'develop' of github.com:friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b5b597221f3ff22152945b2b3cc771c70e4ec8bf;p=friendica.git

Merge branch 'develop' of github.com:friendica/friendica into develop
---

b5b597221f3ff22152945b2b3cc771c70e4ec8bf