Merge branch 'MDL-56017-master' of git://github.com/lameze/moodle
commit64ce7474484f317ce86e3770369b68e45f4c0e10
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 09:36:51 +0000 (25 10:36 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 09:36:51 +0000 (25 10:36 +0100)
treeee1164094ae8d0a2daaba599f40ce1cfc0e58f30
parent26aa08b2f802e15137d202c61b744b08543ac7e2
parentacf17832d6bf698ae218d7941e315fa37726536a
Merge branch 'MDL-56017-master' of git://github.com/lameze/moodle