Merge branch 'wip-MDL-52697-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 09:24:22 +0000 (09:24 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 09:24:22 +0000 (09:24 +0000)

Trivial merge