Merge branch 'wip-MDL-46546-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Oct 2014 09:57:17 +0000 (10:57 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Oct 2014 09:57:17 +0000 (10:57 +0100)

Trivial merge