Merge branch 'MDL-40992' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 00:00:43 +0000 (08:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 00:00:43 +0000 (08:00 +0800)
1  2 
mod/quiz/styles.css
question/behaviour/informationitem/tests/behaviourtype_test.php