Merge pull request #21283 from owncloud/cleanup_config

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

Fri, 18 Dec 2015 13:54:38 +0000 (14:54 +0100)

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

Fri, 18 Dec 2015 13:54:38 +0000 (14:54 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Fri, 18 Dec 2015 13:54:38 +0000 (14:54 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Fri, 18 Dec 2015 13:54:38 +0000 (14:54 +0100)
diff --cc lib/private/helper.php
Simple merge
diff --cc lib/private/util.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 18 Dec 2015 13:54:38 +0000 (14:54 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 18 Dec 2015 13:54:38 +0000 (14:54 +0100)
		1	2
lib/private/helper.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/util.php	patch \|	diff1 \|	diff2 \|	blob \| history