Merge branch 'MDL-56208-master' of git://github.com/andrewnicols/moodle
commit54c1da6690a6efaea274970e5123cc783dcb3103
authorDan Poltawski <dan@moodle.com>
Mon, 17 Oct 2016 11:52:26 +0000 (17 12:52 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Oct 2016 11:52:26 +0000 (17 12:52 +0100)
tree50719b561f4de95da30f89c43d44135f5136cc0a
parenta4c7a0bd95277bb9cc25433c6cb08e0b871fb7c4
parent608edec5ca2082e160ce34279a603375f85bfabe
Merge branch 'MDL-56208-master' of git://github.com/andrewnicols/moodle