Merge branch 'MDL-37172_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:28:54 +0000 (17:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:28:54 +0000 (17:28 +1300)
commitc2e15c4619d3fd8475dc20c25eb923c9b071ae81
tree2709d00fba0884ed534c190f80a48d54103e4236
parentd6fdc727ea7b4568c135f034a04a9dec1648136b
parent0acd3748324875fbe08a18bd15ea5d888f8aff52
Merge branch 'MDL-37172_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

Conflicts:
question/format/learnwise/format.php
lang/en/question.php
question/format/learnwise/format.php