Merge branch 'MDL-49724_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 16:56:12 +0000 (16:56 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 16:56:12 +0000 (16:56 +0000)
commit5ea1de4d8582ec485bd352f00175f80a472defea
treef0cab8edd2ebed7376584b751873e6aa3a41fc47
parentd31c63fc0e8f3f476519cf6b3512c79efb6ef164
parent5e156fe8ce31aa9bba2feb347b2b66e2ec9b2434
Merge branch 'MDL-49724_master' of git://github.com/markn86/moodle