Merge branch 'MDL-31814' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 06:11:14 +0000 (14:11 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 06:11:14 +0000 (14:11 +0800)
1  2 
mod/quiz/editlib.php
question/editlib.php

Simple merge
Simple merge