Merge branch 'MDL-33675-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 13 Jun 2012 03:24:07 +0000 (15:24 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 13 Jun 2012 03:24:07 +0000 (15:24 +1200)
commit7cbd6d8353f3c9713ac5102cee2e72bc80e92719
tree0043c6fd31c0f83ff41e2af9b988c60eee40b711
parent38569ad3a23ca6a33cca9743307b1128f466d931
parent8635302e5431c83d77912fd173f8e5bfaab4902c
Merge branch 'MDL-33675-master-1' of git://git.luns.net.uk/moodle
mod/choice/lang/en/choice.php