Merge branch 'MDL-59733-master-fix' of github.com:xow/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:52:44 +0000 (10:52 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:52:44 +0000 (10:52 +0800)
commitac150167c363c9562abf3b95316355735b748c98
tree4cb9875caa0fbff3561d02e989a4fe6936180489
parentb6f7efb368b3be8c40d533d6cbf5c9bc52738d03
parent025bf573c997d0d48be23666620b671136906be3
Merge branch 'MDL-59733-master-fix' of github.com:xow/moodle