Merge branch 'MDL-50916_m31v2' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jan 2016 12:46:11 +0000 (12:46 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jan 2016 12:46:11 +0000 (12:46 +0000)

Trivial merge