Merge branch 'MDL-59160-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Jun 2017 08:10:25 +0000 (09:10 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Jun 2017 08:10:25 +0000 (09:10 +0100)
commit0ba61c3bf847f95b535f15be6bcd10c2599e9e02
tree8536ffc9b1baefaf050299a1c5378113ac485fcd
parent6f2950cf59d3cbe1ff29a7793b2062cefecf85b3
parent0f398b500d5ad4bd1eae20bc050b1fb8bcf9a13d
Merge branch 'MDL-59160-master' of git://github.com/jleyva/moodle