Merge branch 'wip-MDL-45045_master' of git://github.com/gjb2048/moodle

author Sam Hemelryk <sam@moodle.com>

Mon, 21 Apr 2014 22:46:51 +0000 (10:46 +1200)

committer Sam Hemelryk <sam@moodle.com>

Mon, 21 Apr 2014 22:46:51 +0000 (10:46 +1200)
author Sam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 22:46:51 +0000 (10:46 +1200)
committer Sam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 22:46:51 +0000 (10:46 +1200)
diff --cc lib/blocklib.php
Simple merge
diff --cc lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js

index e1c292e,ff5baab..9f5d80d

Binary files differ
diff --cc lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js

index 441ffde,5d7de55..abb0a92

Binary files differ
diff --cc lib/yui/build/moodle-core-blocks/moodle-core-blocks.js

index cb0724d,d986bf9..a73b584

Binary files differ
diff --cc lib/yui/src/blocks/js/manager.js
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Mon, 21 Apr 2014 22:46:51 +0000 (10:46 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Mon, 21 Apr 2014 22:46:51 +0000 (10:46 +1200)
		1	2
lib/blocklib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/yui/build/moodle-core-blocks/moodle-core-blocks.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/yui/src/blocks/js/manager.js	patch \|	diff1 \|	diff2 \|	blob \| history