Merge branch 'wip-MDL-45045_master' of git://github.com/gjb2048/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 22:46:51 +0000 (10:46 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 22:46:51 +0000 (10:46 +1200)
commit23a9a5632c08f909922ddf60cbc2a4e676d12bf1
tree823e2217ccad17e0d499f209abb67adc1f0cb1d5
parent65ffd68179f2a4d4f10baf7421443664fb9b8e3c
parent625fc64c739c09124dcb9300796101c400003f46
Merge branch 'wip-MDL-45045_master' of git://github.com/gjb2048/moodle

Conflicts:
lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
lib/blocklib.php
lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js
lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
lib/yui/build/moodle-core-blocks/moodle-core-blocks.js
lib/yui/src/blocks/js/manager.js