Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Sat, 27 Jun 2015 10:19:18 +0000 (12:19 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Sat, 27 Jun 2015 10:19:18 +0000 (12:19 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Sat, 27 Jun 2015 10:19:18 +0000 (12:19 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Sat, 27 Jun 2015 10:19:18 +0000 (12:19 +0200)
diff --cc settings/settings.php
Simple merge
diff --cc utils/setup.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Sat, 27 Jun 2015 10:19:18 +0000 (12:19 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Sat, 27 Jun 2015 10:19:18 +0000 (12:19 +0200)
		1	2
settings/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history
utils/setup.php	patch \|	diff1 \|	diff2 \|	blob \| history