Merge branch 'w42_MDL-29866_m22_setupinit' of git://github.com/skodak/moodle

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 25 Oct 2011 14:41:11 +0000 (16:41 +0200)

committer Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 25 Oct 2011 14:41:11 +0000 (16:41 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2011 14:41:11 +0000 (16:41 +0200)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2011 14:41:11 +0000 (16:41 +0200)
diff --cc lib/setup.php
Simple merge
diff --cc lib/setuplib.php
Simple merge
diff --cc lib/weblib.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 25 Oct 2011 14:41:11 +0000 (16:41 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 25 Oct 2011 14:41:11 +0000 (16:41 +0200)
		1	2
lib/setup.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/setuplib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/weblib.php	patch \|	diff1 \|	diff2 \|	blob \| history