Merge branch 'MDL-36985-master-fix' of github.com:xow/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 24 Aug 2017 01:30:32 +0000 (09:30 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 24 Aug 2017 01:30:32 +0000 (09:30 +0800)
commit66c7f7195046c7e6e99e854a665faf7e884403ac
treea67576434e387c0d31b1453660211a8eeb4eb840
parent586181c7d653f658e9cd47bba12c8e071ccab2dd
parent7757d278051f9ef782e30b0ff52c24b2fc294a07
Merge branch 'MDL-36985-master-fix' of github.com:xow/moodle