Merge branch 'MDL-32240' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 22:10:37 +0000 (00:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 22:10:37 +0000 (00:10 +0200)
1  2 
question/editlib.php

Simple merge