Merge branch 'MDL-57017-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 04:40:26 +0000 (12:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 04:40:26 +0000 (12:40 +0800)
commit7d432be4e9c1bef91d543d2a115118f7e54e29a5
tree0358fb3bfff1ab91573a240e7025d90e0eaa8a00
parent2380daba7b305bd84ca07032125236286ecfebb3
parentc6b44215241a4d84b03b15f5b8185b8fd25623d8
Merge branch 'MDL-57017-master' of git://github.com/andrewnicols/moodle