Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Fri, 8 May 2015 18:05:36 +0000 (20:05 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Fri, 8 May 2015 18:05:36 +0000 (20:05 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Fri, 8 May 2015 18:05:36 +0000 (20:05 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Fri, 8 May 2015 18:05:36 +0000 (20:05 +0200)
diff --cc settings/settings.php
Simple merge
diff --cc sql/functions.sql
Simple merge
diff --cc utils/setup.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 8 May 2015 18:05:36 +0000 (20:05 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 8 May 2015 18:05:36 +0000 (20:05 +0200)
		1	2
settings/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history
sql/functions.sql	patch \|	diff1 \|	diff2 \|	blob \| history
utils/setup.php	patch \|	diff1 \|	diff2 \|	blob \| history