Merge branch 'MDL-23273-master' of git://github.com/zbdd/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Mar 2015 09:33:40 +0000 (09:33 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Mar 2015 09:33:40 +0000 (09:33 +0000)
commitadd310ab44bb8a876b7802e9dd83d6864e2f11a1
treed7f1b330cf45e3d59ccc67a819308dfb7a985c09
parentdba564c7db307ab3ef896f7c354af388804ad722
parent5b83949ad116ec884b5da95f63f9e6cac39d8175
Merge branch 'MDL-23273-master' of git://github.com/zbdd/moodle
mod/choice/lang/en/choice.php
mod/choice/lib.php