Merge branch 'MDL-39524' of https://github.com/jrchamp/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 04:52:26 +0000 (12:52 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 04:52:26 +0000 (12:52 +0800)

Trivial merge