Merge branch 'wip-MDL-56633-master' of https://github.com/marinaglancy/moodle
commita9f119efd65c5218a0757e303a40fa747fdaf0e5
authorDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:36:21 +0000 (31 15:36 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:36:21 +0000 (31 15:36 +0000)
tree48a618a14b1360f2a8a1a4c5ffe119a86c66573c
parent6795b0a0c7bb8bbdfdc8cc3a99b5594f1e2f215e
parentc05be214aade1142f760181f32e02888b1b9abda
Merge branch 'wip-MDL-56633-master' of https://github.com/marinaglancy/moodle