Merge branch 'wip-MDL-36407-m24' of git://github.com/samhemelryk/moodle

author Dan Poltawski <dan@moodle.com>

Fri, 16 Nov 2012 07:04:17 +0000 (15:04 +0800)

committer Dan Poltawski <dan@moodle.com>

Fri, 16 Nov 2012 07:04:17 +0000 (15:04 +0800)
author Dan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 07:04:17 +0000 (15:04 +0800)
committer Dan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 07:04:17 +0000 (15:04 +0800)
diff --cc cache/classes/definition.php
Simple merge
diff --cc cache/classes/loaders.php
Simple merge
diff --cc lib/moodlelib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Fri, 16 Nov 2012 07:04:17 +0000 (15:04 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Fri, 16 Nov 2012 07:04:17 +0000 (15:04 +0800)
		1	2
cache/classes/definition.php	patch \|	diff1 \|	diff2 \|	blob \| history
cache/classes/loaders.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history