Merge branch '2.0' into 2.1

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

Mon, 17 Oct 2016 10:30:29 +0000 (12:30 +0200)

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

Mon, 17 Oct 2016 10:30:29 +0000 (12:30 +0200)
author Tim Düsterhus <duesterhus@woltlab.com>
Mon, 17 Oct 2016 10:30:29 +0000 (12:30 +0200)
committer Tim Düsterhus <duesterhus@woltlab.com>
Mon, 17 Oct 2016 10:30:29 +0000 (12:30 +0200)
diff --cc wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/form/RegisterForm.class.php
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 17 Oct 2016 10:30:29 +0000 (12:30 +0200)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 17 Oct 2016 10:30:29 +0000 (12:30 +0200)
		1	2
wcfsetup/install/files/lib/action/FacebookAuthAction.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/form/RegisterForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history