Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Sep 2014 09:35:48 +0000 (10:35 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Sep 2014 09:35:48 +0000 (10:35 +0100)

Trivial merge