Merge branch 'MDL-56552_master' of git://github.com/dmonllao/moodle
commit0579372b702a71b894be70b0ec2e845a6773ac1c
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 05:45:15 +0000 (25 06:45 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 05:45:15 +0000 (25 06:45 +0100)
treee6501a7c85f377f7f6dfa5ee13c9ca9ffd6f1e4b
parent1a2497c3c2cc75b0328649a77ab609e274bcfb2e
parent93432c781ea72a24b416344e559bfa7a414471ea
Merge branch 'MDL-56552_master' of git://github.com/dmonllao/moodle