Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 2 Oct 2014 08:35:30 +0000 (09:35 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 2 Oct 2014 08:35:30 +0000 (09:35 +0100)

Trivial merge