Merge branch 'MDL-59734-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 06:31:24 +0000 (08:31 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 06:31:24 +0000 (08:31 +0200)
commit7643d75af007f04987674df26324abd9bcd94d42
treef6d2216d11c301b24fb9ff2494e5ad8d7b1c573a
parentab96699e52fb3f53bcec852ff903e157e52f23f6
parented7431a37b591cdf51c68f620a6de8e5c605be9c
Merge branch 'MDL-59734-master' of git://github.com/andrewnicols/moodle