Merge branch 'MDL-34137_label_dndupload' of git://github.com/davosmith/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 06:55:13 +0000 (14:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 06:55:13 +0000 (14:55 +0800)

Trivial merge