Merge branch 'wip-MDL-51819-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 12 Nov 2015 08:46:34 +0000 (08:46 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 12 Nov 2015 08:46:34 +0000 (08:46 +0000)

Trivial merge