Merge pull request #2914 from Kondou-ger/label_overlapping_value

author Bart Visscher <bartv@thisnet.nl>

Sat, 29 Jun 2013 11:09:50 +0000 (04:09 -0700)

committer Bart Visscher <bartv@thisnet.nl>

Sat, 29 Jun 2013 11:09:50 +0000 (04:09 -0700)
author Bart Visscher <bartv@thisnet.nl>
Sat, 29 Jun 2013 11:09:50 +0000 (04:09 -0700)
committer Bart Visscher <bartv@thisnet.nl>
Sat, 29 Jun 2013 11:09:50 +0000 (04:09 -0700)
diff --cc core/templates/installation.php
Simple merge
diff --cc lib/setup.php
Simple merge
author	Bart Visscher <bartv@thisnet.nl>
	Sat, 29 Jun 2013 11:09:50 +0000 (04:09 -0700)
committer	Bart Visscher <bartv@thisnet.nl>
	Sat, 29 Jun 2013 11:09:50 +0000 (04:09 -0700)
		1	2
core/templates/installation.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/setup.php	patch \|	diff1 \|	diff2 \|	blob \| history