Merge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Dec 2016 11:50:50 +0000 (11:50 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Dec 2016 11:50:50 +0000 (11:50 +0000)
commit4053aa77fa911c794124926598944d87c0bf8acc
tree9ebe2abefebd86b8f2064f228530fc8e9d858fc4
parent5d970e1aa025914597e2d18913cd5f054cf5d03c
parent7180cdc7b5bc6f046667de94e36ae72798b2a360
Merge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle