Merge branch 'MDL-42395_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Feb 2016 11:17:02 +0000 (11:17 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Feb 2016 11:17:02 +0000 (11:17 +0000)

Trivial merge