Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 22:27:30 +0000 (00:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 22:27:30 +0000 (00:27 +0200)
commite154e9d8cd5837961e58f1850783756b8a8cc680
tree46b569b0a8d72d725f52e938ecc2b36ca10916c7
parent067573bd0274a0d664f02e12148439032e49603f
parentffb8aff65c7deeb422b3a7afd94f7a6c9f7c3172
Merge branch 'MDL-44000-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
lib/editor/atto/plugins/image/lib.php
lib/editor/atto/plugins/image/styles.css
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
lib/editor/atto/plugins/image/yui/src/button/js/button.js