Merge develop into 2512_rebase_cleanup

Conflicts:
	include/identity.php
This commit is contained in:
rabuzarus 2015-12-25 19:18:12 +01:00
commit ba2517fd71

Diff Content Not Available