Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled

author Thomas Müller <thomas.mueller@tmit.eu>

Mon, 30 Sep 2013 17:53:41 +0000 (10:53 -0700)

committer Thomas Müller <thomas.mueller@tmit.eu>

Mon, 30 Sep 2013 17:53:41 +0000 (10:53 -0700)
author Thomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 17:53:41 +0000 (10:53 -0700)
committer Thomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 17:53:41 +0000 (10:53 -0700)
diff --cc lib/base.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 30 Sep 2013 17:53:41 +0000 (10:53 -0700)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 30 Sep 2013 17:53:41 +0000 (10:53 -0700)
		1	2
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history