Merge pull request #7852 from josh4trunks/basic_auth_fix

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

Mon, 28 Apr 2014 19:46:52 +0000 (21:46 +0200)

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

Mon, 28 Apr 2014 19:46:52 +0000 (21:46 +0200)
author Thomas Müller <thomas.mueller@tmit.eu>
Mon, 28 Apr 2014 19:46:52 +0000 (21:46 +0200)
committer Thomas Müller <thomas.mueller@tmit.eu>
Mon, 28 Apr 2014 19:46:52 +0000 (21:46 +0200)
diff --cc config/config.sample.php
Simple merge
diff --cc lib/base.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 28 Apr 2014 19:46:52 +0000 (21:46 +0200)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 28 Apr 2014 19:46:52 +0000 (21:46 +0200)
		1	2
config/config.sample.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history