From: rabuzarus <>
Date: Fri, 25 Dec 2015 18:18:12 +0000 (+0100)
Subject: Merge develop into 2512_rebase_cleanup
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ba2517fd716fe93ef95c644fd50794c809e27640;p=friendica.git

Merge develop into 2512_rebase_cleanup

Conflicts:
	include/identity.php
---

ba2517fd716fe93ef95c644fd50794c809e27640