Merge branch 'MDL-47494' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Sep 2015 16:38:27 +0000 (18:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Sep 2015 16:38:27 +0000 (18:38 +0200)
commit201a26bbaab81d46cc9da8d6c856add738b8d926
tree8e841a72698688bc1222047de3746f2cf67d076e
parent5c7c9ea99ac45ae369c4c11f19f1cd41ce108c60
parent8bc1d28b1a8dd5adf7fa6aebc37879d45e6256e5
Merge branch 'MDL-47494' of git://github.com/timhunt/moodle

Note: Fixed some minor grunt and EOF whitespace issues while merging.
question/type/ddimageortext/questionbase.php
question/type/ddimageortext/yui/build/moodle-qtype_ddimageortext-form/moodle-qtype_ddimageortext-form-debug.js
question/type/ddimageortext/yui/build/moodle-qtype_ddimageortext-form/moodle-qtype_ddimageortext-form.js
question/type/ddmarker/db/upgrade.php
question/type/ddwtos/lib.php
question/type/gapselect/lib.php