Merge branch 'MDL-50658' of https://github.com/spvickers/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 15:50:45 +0000 (16:50 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 15:50:45 +0000 (16:50 +0100)

Trivial merge