Merge branch 'MDL-58623_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 20 Apr 2017 08:08:52 +0000 (16:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 20 Apr 2017 08:08:52 +0000 (16:08 +0800)
commit10e5071b8550a79fdf586f2ef734214365e78113
tree2c6ebe82e4f040a4261c9de9d80cdf8d962ac82b
parent8afd1e2bd66a8bede1af68100e2aced8314144bc
parent0f5e3fd952ac199eae761f17585da295469450f6
Merge branch 'MDL-58623_master' of git://github.com/markn86/moodle