Merge branch 'MDL-51434_master-fix-unit-test' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 10:25:21 +0000 (11:25 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:35 +0000 (16:31 +0100)

Trivial merge