Merge branch 'MDL-45740_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Feb 2016 11:02:22 +0000 (11:02 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Feb 2016 11:02:22 +0000 (11:02 +0000)
commit98e01bb70e09f9209ab3e8365a38a6a692200ed2
tree2c51ca549d3ecbb956822203a99f474bb8da14c9
parentb0e7075214f4536b9051bce3924849bbcd4f385e
parentda82688689b8c0e0ff5771e5389dd812a6a64022
Merge branch 'MDL-45740_master' of git://github.com/markn86/moodle
mod/choice/lang/en/choice.php