Merge branch 'MDL-58450_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 31 Mar 2017 08:12:16 +0000 (09:12 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 31 Mar 2017 08:12:16 +0000 (09:12 +0100)
commitacfab4cc7b33e5d910df5c292ec9a9459a9be0a5
treed49ced74c6f1c5ac8b1a1a2a33b6d66a4ed9f114
parentb0f3e6d618aa43d281bb11ccb09f95e0df09617e
parent1535cd5bade30d71575110fbd32bfa68192c6bb9
Merge branch 'MDL-58450_master' of git://github.com/dmonllao/moodle