Merge branch 'next' into next-lantia

author Tim Düsterhus <duesterhus@woltlab.com>

Wed, 6 Jan 2016 17:33:32 +0000 (18:33 +0100)

committer Tim Düsterhus <duesterhus@woltlab.com>

Wed, 6 Jan 2016 17:33:32 +0000 (18:33 +0100)
author Tim Düsterhus <duesterhus@woltlab.com>
Wed, 6 Jan 2016 17:33:32 +0000 (18:33 +0100)
committer Tim Düsterhus <duesterhus@woltlab.com>
Wed, 6 Jan 2016 17:33:32 +0000 (18:33 +0100)
diff --cc wcfsetup/install/files/lib/system/WCF.class.php
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Wed, 6 Jan 2016 17:33:32 +0000 (18:33 +0100)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Wed, 6 Jan 2016 17:33:32 +0000 (18:33 +0100)
		1	2
wcfsetup/install/files/lib/system/WCF.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history