Merge branch 'MDL-50666-master-fix' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 20 Dec 2017 00:42:58 +0000 (13:42 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 20 Dec 2017 00:42:58 +0000 (13:42 +1300)
commitb65198b81b2e314d8c12bc234abf047bbf2351ec
treed87d6eb797fad8802c537c801f5898ddac43f7a6
parenta8dffa2d037ce2fb60fbef366779f810473041ab
parentccb8edbff515e13a344417b4610c392d851431ff
Merge branch 'MDL-50666-master-fix' of git://github.com/junpataleta/moodle