Merge branch 'MDL-46212' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 23:43:09 +0000 (11:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 23:43:09 +0000 (11:43 +1200)
commit95d294368fa5fa31ce546e84a363a152e8422175
tree17fe63cb65f64b7ea489b7371bf0ad15f2279cfc
parentcf9ae1134ccc74602ff228d04080d80887c1a043
parentf4fe3968a2467952d38aeaa24d89372b2c3a2e56
Merge branch 'MDL-46212' of git://github.com/timhunt/moodle

Conflicts:
question/type/calculated/question.php
question/type/calculated/edit_calculated_form.php
question/type/calculated/question.php
question/type/calculated/questiontype.php
question/type/calculatedmulti/edit_calculatedmulti_form.php