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

Trivial merge