Merge branch 'MDL-56536-master' of git://github.com/jleyva/moodle
commit274c5837e73c86686ffe74820a6269f7b5e2f89e
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 09:12:54 +0000 (25 10:12 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 09:12:54 +0000 (25 10:12 +0100)
tree88101961d1fdf4cc52b53174aeeff4ed1b581ebd
parentad07960d895fdc5ae4154d4f91297ddfd61cdebf
parent5d5e30c64d3a7ce6c7cf99adeef5edb8beee8f2f
Merge branch 'MDL-56536-master' of git://github.com/jleyva/moodle