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

Trivial merge