Merge branch 'MDL-27631' of git://github.com/mkassaei/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 01:00:17 +0000 (03:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 01:00:17 +0000 (03:00 +0200)
1  2 
mod/quiz/editlib.php
question/editlib.php

Simple merge
Simple merge