Merge branch 'MDL-56602-master-upgrade' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 11 Nov 2016 10:22:20 +0000 (10:22 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 11 Nov 2016 10:22:20 +0000 (10:22 +0000)
commite9eec33560c02b91d3929bd344fe99435e3a6425
tree670e600392f22b2d5e1e6177e626aa2c9535cd2d
parent9fa6d4e04e88de2fc43dcb1717c581d9791beb88
parentea10a0319b9d5db90ffbd7b3839bc5dc3fe14687
Merge branch 'MDL-56602-master-upgrade' of git://github.com/andrewnicols/moodle