Merge branch 'MDL-59797-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:05:15 +0000 (10:05 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:05:15 +0000 (10:05 +0800)
commitc1e75004a5ee0679e48832fd9a85f4b9c636953c
tree750a70cc2d9f903253c46267ca96ea1e452be753
parent8cb6a55147d600fe45162cd456bc3507699b8eb9
parentb453e4c92fb080d852789069cc6e461af2239258
Merge branch 'MDL-59797-master' of git://github.com/lameze/moodle