Merge branch 'MDL-58836-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 May 2017 05:56:42 +0000 (06:56 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 10 May 2017 05:56:42 +0000 (06:56 +0100)
commitfd8d1648a700767924c934f1c8414bbfb06d7868
tree849188eeb2741b2eea927f5029889a4999e2a55c
parent265a1eafc5327df9189962aa18ef9e741ea0e90b
parent406b92c6fd8588a346b7fc1e3b245e1a711b4d2c
Merge branch 'MDL-58836-master' of git://github.com/damyon/moodle