Merge branch 'MDL-32239' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Apr 2012 02:31:30 +0000 (14:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Apr 2012 02:31:30 +0000 (14:31 +1200)
1  2 
question/editlib.php

Simple merge