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

Trivial merge