Merge branch 'MDL-56627-master' of git://github.com/damyon/moodle
commit9e972b3da45d954cf82447b931440269fa9d561c
authorDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:54:22 +0000 (31 15:54 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:54:22 +0000 (31 15:54 +0000)
tree4cca2ae96ad07af98895fb31aa786db925eeff3f
parenta9f119efd65c5218a0757e303a40fa747fdaf0e5
parent70f00107126b9ee881fe72b3538d321ce8027ee7
Merge branch 'MDL-56627-master' of git://github.com/damyon/moodle