Merge branch 'MDL-53489' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 03:02:03 +0000 (11:02 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 03:02:03 +0000 (11:02 +0800)

Trivial merge