Merge branch 'MDL-25492' of git://github.com/jmvedrine/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:02:02 +0000 (20:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:02:02 +0000 (20:02 +0200)
1  2 
question/format.php
question/format/gift/format.php

Simple merge
Simple merge