Merge branch 'MDL-57012-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:01:10 +0000 (18:01 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:01:10 +0000 (18:01 +0000)
commitd3b13065ce81a2494cd7a3564b8d897615028808
tree6c9da90a34a99c92b5d755bda1b71afe176173e6
parent73430100ff77bc06f9a81411f0fd26d777ddee82
parent00f5c9559089f25f8f5b8d30480debe72a3db188
Merge branch 'MDL-57012-master' of git://github.com/damyon/moodle