Merge branch 'MDL-53207' of https://github.com/dg711/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 01:31:07 +0000 (09:31 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 01:31:07 +0000 (09:31 +0800)

Trivial merge