Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 16:30:20 +0000 (17:30 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 16:30:20 +0000 (17:30 +0100)

Trivial merge