Merge branch 'MDL-47603' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Oct 2014 12:33:56 +0000 (13:33 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Oct 2014 12:33:56 +0000 (13:33 +0100)

Trivial merge