Merge branch 'wip-MDL-55127_master' of https://github.com/dg711/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 10:12:46 +0000 (11:12 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 10:12:46 +0000 (11:12 +0100)
commit7c085e1a2d0ecea03cc12de14098a733b77a3349
tree9acb1dcb97cc45f4990716dc4f03209eecef1da9
parentf71df007d16cab09da1d721172dcad3d7435580a
parent2af9ad7d30ba933a20c328bb6f7158e361c3dfd6
Merge branch 'wip-MDL-55127_master' of https://github.com/dg711/moodle