Merge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 13:58:59 +0000 (15:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 13:58:59 +0000 (15:58 +0200)
1  2 
mod/choice/lang/en/choice.php

Simple merge