Merge branch 'MDL-56656-master' of git://github.com/ankitagarwal/moodle
commitcb151980c4e54db297f53743db595d304de9c739
authorDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:05:10 +0000 (22 18:05 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:05:10 +0000 (22 18:05 +0000)
tree383730f615c593e155e4dd871fb2132ab1859af8
parent03f450c10d7d1bc89f7aa193c421104988ce79cb
parent7597ab0b99181b42af44ac4faa6f1fb39565b00d
Merge branch 'MDL-56656-master' of git://github.com/ankitagarwal/moodle