Merge pull request #8443 from owncloud/csrf-on-login-and-logout

author Vincent Petry <pvince81@owncloud.com>

Mon, 2 Jun 2014 09:27:20 +0000 (11:27 +0200)

committer Vincent Petry <pvince81@owncloud.com>

Mon, 2 Jun 2014 09:27:20 +0000 (11:27 +0200)
author Vincent Petry <pvince81@owncloud.com>
Mon, 2 Jun 2014 09:27:20 +0000 (11:27 +0200)
committer Vincent Petry <pvince81@owncloud.com>
Mon, 2 Jun 2014 09:27:20 +0000 (11:27 +0200)
diff --cc lib/base.php
Simple merge
diff --cc lib/private/user.php
Simple merge
author	Vincent Petry <pvince81@owncloud.com>
	Mon, 2 Jun 2014 09:27:20 +0000 (11:27 +0200)
committer	Vincent Petry <pvince81@owncloud.com>
	Mon, 2 Jun 2014 09:27:20 +0000 (11:27 +0200)
		1	2
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/user.php	patch \|	diff1 \|	diff2 \|	blob \| history