From: Roland Haeder Date: Fri, 4 Mar 2016 19:05:15 +0000 (+0100) Subject: Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cc4349777a55bd86c2b60c652637ac5646803fdd;p=friendica.git Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop Signed-off-by: Roland Haeder --- cc4349777a55bd86c2b60c652637ac5646803fdd