Merge branch 'MDL-46284-master-fix' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 07:54:07 +0000 (08:54 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 07:54:07 +0000 (08:54 +0100)

Trivial merge