Merge branch 'MDL-21625_b' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Nov 2012 03:27:43 +0000 (16:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Nov 2012 03:27:43 +0000 (16:27 +1300)
1  2 
question/editlib.php

Simple merge