Merge branch 'MDL-35793' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:56:51 +0000 (12:56 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:56:51 +0000 (12:56 +0800)
1  2 
lang/en/question.php
question/previewlib.php

Simple merge
Simple merge