Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:27:23 +0000 (09:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:27:23 +0000 (09:27 +1300)
commit0ea11b7ceee7a1f61e3d6b65af230f5cdb18039c
tree24943a61f64f8764864ccf949a6bc65eaf0cfa05
parentb9c16d401a25c00fc7c67965596eb4c6bb421aad
parent0b98f8e8e0c78679891eb474952a96a5670d5467
Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js
lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue.js
lib/yui/src/chooserdialogue/js/chooserdialogue.js
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css