Merge branch 'MDL-59784-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:47:54 +0000 (10:47 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:47:54 +0000 (10:47 +0800)
commitb6f7efb368b3be8c40d533d6cbf5c9bc52738d03
tree1672f0a776b446a6e6556ed1fa833c7145b9e987
parent959c6204e6a495a089ae04620ecbf7430730bbc5
parente5bdf51ce5f6ef93a90a1fe29e604c01fe24acc6
Merge branch 'MDL-59784-master' of git://github.com/andrewnicols/moodle