Merge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 03:45:11 +0000 (11:45 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 03:45:11 +0000 (11:45 +0800)
1  2 
blocks/html/block_html.php
grade/grading/manage.php
lib/questionlib.php
question/type/edit_question_form.php

Simple merge
Simple merge
Simple merge
Simple merge