Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Sep 2017 00:55:47 +0000 (08:55 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Sep 2017 00:55:47 +0000 (08:55 +0800)
commit311a0b283bb53bf5721f32f4fe9ea6f9733765d5
treed17ab43db095db44b5db492811b7548d66a5feaa
parente658430a8892e692862007677e5ca4fe4a1d2b7c
parenta7bf76cee8c9e2d378ba4b84e5335457f853125c
Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle