Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Oct 2013 07:16:08 +0000 (15:16 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Oct 2013 10:16:50 +0000 (12:16 +0200)
commit6f4747d7b42136a56927071d0d57562912c4f305
tree26c90d6341bc494ac949b5feb5f67a82054131b0
parentd4256630e75c3039637386d6de83a01287c7ebb1
parentee0a9ce92a5bfe2688917ae8739ac2fff6b82c1a
Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
theme/bootstrapbase/style/moodle.css
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
lib/yui/src/notification/js/dialogue.js
theme/base/style/core.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css