Merge branch 'MDL-56334-master-v2' of git://github.com/snake/moodle
commite376b4bd64313bc866ddbe36a9daeca075990362
authorDan Poltawski <dan@moodle.com>
Wed, 26 Oct 2016 08:57:50 +0000 (26 09:57 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 26 Oct 2016 08:57:50 +0000 (26 09:57 +0100)
treed547282a87ef90f88a25dffea4bb29e5312ce72b
parentc64230234f93dd4033910f6f4132b6894ffb0818
parent020c98e373443502884f3541dd7499323f550b7f
Merge branch 'MDL-56334-master-v2' of git://github.com/snake/moodle