Merge branch 'MDL-51090' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 01:47:34 +0000 (09:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 01:47:34 +0000 (09:47 +0800)
1  2 
question/behaviour/rendererbase.php

Simple merge