Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape

author Michael Vogel <icarus@dabo.de>

Tue, 17 Feb 2015 18:18:17 +0000 (19:18 +0100)

committer Michael Vogel <icarus@dabo.de>

Tue, 17 Feb 2015 18:18:17 +0000 (19:18 +0100)
author Michael Vogel <icarus@dabo.de>
Tue, 17 Feb 2015 18:18:17 +0000 (19:18 +0100)
committer Michael Vogel <icarus@dabo.de>
Tue, 17 Feb 2015 18:18:17 +0000 (19:18 +0100)
diff --cc boot.php
Simple merge
diff --cc view/templates/profile_vcard.tpl
Simple merge
diff --cc view/theme/vier/templates/profile_vcard.tpl
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Tue, 17 Feb 2015 18:18:17 +0000 (19:18 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Tue, 17 Feb 2015 18:18:17 +0000 (19:18 +0100)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/templates/profile_vcard.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/vier/templates/profile_vcard.tpl	patch \|	diff1 \|	diff2 \|	blob \| history