Merge branch 'MDL-47691' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:24:22 +0000 (17:24 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:24:22 +0000 (17:24 +0100)

Trivial merge