Merge branch 'MDL-48165-master-dimgrades' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Sep 2015 09:14:47 +0000 (10:14 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Sep 2015 09:14:47 +0000 (10:14 +0100)

Trivial merge