Merge branch 'MDL-59240-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 06:31:34 +0000 (07:31 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 06:31:34 +0000 (07:31 +0100)
commita1e094f9dd933cb231b25ff6a587dc66275d3f96
tree5b6a1581ca5ed16e7cbb40f0267c36f280b7f37c
parentd3e69bee38abaf49d6dd5b23237c2a3838488111
parent977fdfa30bb39e3d7887e3feaa14c85a6f983e50
Merge branch 'MDL-59240-master' of git://github.com/jleyva/moodle