Merge branch 'MDL-45034-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 21:23:30 +0000 (09:23 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 21:23:30 +0000 (09:23 +1200)
Conflicts:
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js


Trivial merge