Merge branch 'MDL-48947_master-dnd-span' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 2 Oct 2015 07:05:13 +0000 (08:05 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 2 Oct 2015 07:05:13 +0000 (08:05 +0100)

Trivial merge