Merge branch 'MDL-52402' of git://github.com/mr-russ/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 12:46:20 +0000 (12:46 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 12:46:20 +0000 (12:46 +0000)

Trivial merge