Merge branch 'MDL-58904-master-fix' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 12 May 2017 07:19:07 +0000 (08:19 +0100)
committerJun Pataleta <jun@moodle.com>
Fri, 12 May 2017 07:49:02 +0000 (15:49 +0800)
commit4f3962e4b4c0634adb5d8769ad9a6c267d65e6f2
treee6a4d4d40de37da5c7f6d2cdd8a4950e6472c5f8
parentae9da6a22263e9c825b1a3070ca4486b256569b1
parentc0af95d789e4b0ebbba598a777cf23dcdbe8afa8
Merge branch 'MDL-58904-master-fix' of https://github.com/snake/moodle