Merge branch 'MDL-52126' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Sun, 15 Nov 2015 16:05:33 +0000 (16:05 +0000)
committerDan Poltawski <dan@moodle.com>
Sun, 15 Nov 2015 16:05:33 +0000 (16:05 +0000)

Trivial merge