Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)

committer Sarah Hoffmann <lonvia@denofr.de>

Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)
committer Sarah Hoffmann <lonvia@denofr.de>
Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)
diff --cc lib/lib.php
Simple merge
diff --cc settings/settings.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Sun, 28 Dec 2014 22:11:57 +0000 (23:11 +0100)
		1	2
lib/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
settings/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history