Merge branch 'MDL-55140_m32v2' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 00:48:36 +0000 (08:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 00:48:36 +0000 (08:48 +0800)
1  2 
mod/choice/lib.php
mod/choice/tests/behat/publish_results.feature

Simple merge