Merge branch 'MDL-49146' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 12:13:30 +0000 (12:13 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 12:13:30 +0000 (12:13 +0000)

Trivial merge