Merge branch 'MDL-51250_master-empty-return-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 13:14:27 +0000 (14:14 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:32:38 +0000 (16:32 +0100)

Trivial merge