Merge branch 'MDL-52414_m31v7' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 14:31:39 +0000 (14:31 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 14:31:39 +0000 (14:31 +0000)

Trivial merge