Merge branch 'MDL-56763-master' of git://github.com/lameze/moodle
commit820a43510f4ab1500b1b2a0ad3ec297510726435
authorDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 08:10:01 +0000 (17 16:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 08:10:01 +0000 (17 16:10 +0800)
treee8d420842af9983812bd207c84bfa28f9638afae
parent237af2ba611b34b157fd718016c08146841c8fe3
parent25ca6f16382ea52d79dc1f5c5055af1c39d202d5
Merge branch 'MDL-56763-master' of git://github.com/lameze/moodle