Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession

author Lukas Reschke <lukas@statuscode.ch>

Sun, 4 Nov 2012 13:54:02 +0000 (05:54 -0800)

committer Lukas Reschke <lukas@statuscode.ch>

Sun, 4 Nov 2012 13:54:02 +0000 (05:54 -0800)
author Lukas Reschke <lukas@statuscode.ch>
Sun, 4 Nov 2012 13:54:02 +0000 (05:54 -0800)
committer Lukas Reschke <lukas@statuscode.ch>
Sun, 4 Nov 2012 13:54:02 +0000 (05:54 -0800)
diff --cc lib/base.php
Simple merge
diff --cc lib/template.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Lukas Reschke <lukas@statuscode.ch>
	Sun, 4 Nov 2012 13:54:02 +0000 (05:54 -0800)
committer	Lukas Reschke <lukas@statuscode.ch>
	Sun, 4 Nov 2012 13:54:02 +0000 (05:54 -0800)
		1	2
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/template.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history