Merge branch 'MDL-46331' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Sep 2014 10:55:16 +0000 (11:55 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Sep 2014 10:55:16 +0000 (11:55 +0100)

Trivial merge