Merge branch 'MDL-56986-master-fix' of https://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Nov 2016 01:04:26 +0000 (09:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Nov 2016 01:04:26 +0000 (09:04 +0800)
commit5009bcd9b4be6b100d3d45102397160200fa8702
treeb4c605aaa28a80051fa16ccdc8628860036eb5d3
parent4b2790c580470fb3880ff936a05aca6eedf5c70c
parent5e43ccd3b9ef15b3fc45bbd9529aba92eeb620d9
Merge branch 'MDL-56986-master-fix' of https://github.com/lameze/moodle