Merge branch 'wip-MDL-47617-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 12:17:36 +0000 (13:17 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 12:17:36 +0000 (13:17 +0100)

Trivial merge