MDL-20636 Merge branch 'master' into qe2_wip
authorTim Hunt <T.J.Hunt@open.ac.uk>
Thu, 3 Feb 2011 11:07:11 +0000 (11:07 +0000)
committerTim Hunt <T.J.Hunt@open.ac.uk>
Thu, 3 Feb 2011 11:18:40 +0000 (11:18 +0000)
commit74c479f212894edc81ee49e34248c1cdbe1c229a
tree20e70404a799304c02aac1f4725b24b2e742f48b
parent0fafed0f091c883ef73180e84c0c747ad87b029f
parenteef3578af0d6376aa4e694c31c8b50d8ab34af30
MDL-20636 Merge branch 'master' into qe2_wip

Conflicts:
lib/questionlib.php
question/type/calculated/lang/en/qtype_calculated.php
question/type/questiontype.php
lib/moodlelib.php
mod/quiz/locallib.php
question/format/gift/format.php
question/format/gift/simpletest/testgiftformat.php
question/type/numerical/question.php
question/type/shortanswer/question.php