Merge branch 'MDL-50891_master-unit-test-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Sep 2015 08:23:07 +0000 (09:23 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Sep 2015 08:23:07 +0000 (09:23 +0100)

Trivial merge