Merge develop into 3011_hcard_vcard

author rabuzarus <trebor@central-unit>

Tue, 1 Dec 2015 17:34:13 +0000 (18:34 +0100)

committer rabuzarus <trebor@central-unit>

Tue, 1 Dec 2015 17:34:13 +0000 (18:34 +0100)
author rabuzarus <trebor@central-unit>
Tue, 1 Dec 2015 17:34:13 +0000 (18:34 +0100)
committer rabuzarus <trebor@central-unit>
Tue, 1 Dec 2015 17:34:13 +0000 (18:34 +0100)
diff --cc include/identity.php
Simple merge
diff --cc view/theme/vier/style.css
Simple merge
author	rabuzarus <trebor@central-unit>
	Tue, 1 Dec 2015 17:34:13 +0000 (18:34 +0100)
committer	rabuzarus <trebor@central-unit>
	Tue, 1 Dec 2015 17:34:13 +0000 (18:34 +0100)
		1	2
include/identity.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/vier/style.css	patch \|	diff1 \|	diff2 \|	blob \| history