Merge branch 'wip-MDL-46576-master-upgrade-fix' of https://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 10 Oct 2014 08:20:30 +0000 (09:20 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Oct 2014 08:20:30 +0000 (09:20 +0100)

Trivial merge