Merge pull request #13314 from owncloud/login-hook-logout

author Morris Jobke <hey@morrisjobke.de>

Thu, 22 Jan 2015 22:34:19 +0000 (23:34 +0100)

committer Morris Jobke <hey@morrisjobke.de>

Thu, 22 Jan 2015 22:34:19 +0000 (23:34 +0100)
author Morris Jobke <hey@morrisjobke.de>
Thu, 22 Jan 2015 22:34:19 +0000 (23:34 +0100)
committer Morris Jobke <hey@morrisjobke.de>
Thu, 22 Jan 2015 22:34:19 +0000 (23:34 +0100)
diff --cc lib/base.php
Simple merge
diff --cc lib/private/util.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Thu, 22 Jan 2015 22:34:19 +0000 (23:34 +0100)
committer	Morris Jobke <hey@morrisjobke.de>
	Thu, 22 Jan 2015 22:34:19 +0000 (23:34 +0100)
		1	2
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/util.php	patch \|	diff1 \|	diff2 \|	blob \| history