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)
1  2 
mod/choice/lang/en/choice.php

Simple merge