Merge branch 'MDL-55902-master' of git://github.com/junpataleta/moodle
commit1a2497c3c2cc75b0328649a77ab609e274bcfb2e
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 05:38:13 +0000 (25 06:38 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 05:38:13 +0000 (25 06:38 +0100)
treea2fd4bd025949ec6eef215219cbc3a3b9662472e
parent1e56070d3491abaeb28de637b61bcd5e9742dfe1
parent14d6c1cf79b648567572639b9323510951681c20
Merge branch 'MDL-55902-master' of git://github.com/junpataleta/moodle