Merge pull request #21336 from owncloud/system-root-certs

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

Tue, 12 Jan 2016 14:01:46 +0000 (15:01 +0100)

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

Tue, 12 Jan 2016 14:01:46 +0000 (15:01 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Tue, 12 Jan 2016 14:01:46 +0000 (15:01 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Tue, 12 Jan 2016 14:01:46 +0000 (15:01 +0100)
diff --cc config/config.sample.php
Simple merge
diff --cc settings/admin.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 12 Jan 2016 14:01:46 +0000 (15:01 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 12 Jan 2016 14:01:46 +0000 (15:01 +0100)
		1	2
config/config.sample.php	patch \|	diff1 \|	diff2 \|	blob \| history
settings/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history