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)
commitd668060fdc23b0f0ba02b44940b9f62974fdeb6b
treea553cd3857179c65fe1dc574f1db96f6ade22a3e
parent11310954ead5bc13d35aa1115bee7fa6c2eb16f8
parentd3931a7d4db59435b1f639d25bee856f9bbc9477
Merge branch 'MDL-45034-master' of git://github.com/damyon/moodle

Conflicts:
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js