Merge branch 'MDL-53366-master' of https://github.com/lucisgit/moodle
commit607bdc382933489dd96ae0052265d464dd68898a
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 18:05:00 +0000 (25 19:05 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 18:05:00 +0000 (25 19:05 +0100)
treeb26937e2a11cfa0e1d97a9baed5396dc5c4fe4cf
parentd5e902d3ab56ff114e27c4cce0d61ae2e26f1571
parent19f8cd61b0ddb3b98de9ee276c9cd5f545522f2c
Merge branch 'MDL-53366-master' of https://github.com/lucisgit/moodle