Merge branch 'MDL-29060' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 10:47:51 +0000 (11:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 10:47:51 +0000 (11:47 +0100)
1  2 
question/format/xml/format.php

Simple merge