Merge branch 'MDL-41945-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 11:39:35 +0000 (12:39 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 11:39:35 +0000 (12:39 +0100)
commit2e6f52212fef3997ee05c8be8556163ab6875de6
tree4f711449a4b58fba4690698c596bf75b7211a140
parented63718caa48803843a14140d8a27f04aba9c8c4
parentc89d23ee6d132760891e71e5f0c14dcb5ef69a1b
Merge branch 'MDL-41945-master' of git://github.com/cameron1729/moodle