Merge branch 'MDL-46212' of git://github.com/timhunt/moodle

author Sam Hemelryk <sam@moodle.com>

Mon, 7 Jul 2014 23:43:09 +0000 (11:43 +1200)

committer Sam Hemelryk <sam@moodle.com>

Mon, 7 Jul 2014 23:43:09 +0000 (11:43 +1200)
author Sam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 23:43:09 +0000 (11:43 +1200)
committer Sam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 23:43:09 +0000 (11:43 +1200)
diff --cc question/type/calculated/edit_calculated_form.php
Simple merge
diff --cc question/type/calculated/question.php
Simple merge
diff --cc question/type/calculated/questiontype.php
Simple merge
diff --cc question/type/calculatedmulti/edit_calculatedmulti_form.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Mon, 7 Jul 2014 23:43:09 +0000 (11:43 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Mon, 7 Jul 2014 23:43:09 +0000 (11:43 +1200)
		1	2
question/type/calculated/edit_calculated_form.php	patch \|	diff1 \|	diff2 \|	blob \| history
question/type/calculated/question.php	patch \|	diff1 \|	diff2 \|	blob \| history
question/type/calculated/questiontype.php	patch \|	diff1 \|	diff2 \|	blob \| history
question/type/calculatedmulti/edit_calculatedmulti_form.php	patch \|	diff1 \|	diff2 \|	blob \| history