Merge branch 'MDL-49368' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Jun 2015 11:14:35 +0000 (12:14 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Jun 2015 11:14:35 +0000 (12:14 +0100)

Trivial merge