Merge branch 'MDL-52036-master-resettable' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 5 Nov 2015 09:03:20 +0000 (09:03 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 5 Nov 2015 09:03:20 +0000 (09:03 +0000)

Trivial merge