Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 13:35:29 +0000 (14:35 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 13:35:29 +0000 (14:35 +0100)

Trivial merge