Merge branch 'MDL-52945' of https://github.com/mr-russ/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Mar 2016 01:43:30 +0000 (09:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Mar 2016 01:43:30 +0000 (09:43 +0800)

Trivial merge