Merge branch 'MDL-56487-master' of git://github.com/andrewnicols/moodle
commit737e3c3b67d43367aa34dfecf2e14ec7b866205c
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 07:42:58 +0000 (25 08:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 07:42:58 +0000 (25 08:42 +0100)
tree27f74bf527aec0358151a62751b4de67cbdea9d4
parentab9ca549e77d958248a753497b046fc779b7fe3c
parentb7daff836d23277352a973d344d5a58dbf1f0cd9
Merge branch 'MDL-56487-master' of git://github.com/andrewnicols/moodle