Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle
commit4e2ae9caeeea46934b043a45c6cc770f3830a27b
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 06:35:41 +0000 (9 14:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 06:35:41 +0000 (9 14:35 +0800)
tree4ca18ad2a19f42aebfab417000e3ad9858abaade
parent33788800ec8fef1716a0e2cef672f00688ad866c
parentf2dab83445fdfaba5355dd7f1032af513e5108a2
Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle