MDL-47494 gapselect: Merge branch 'diff_2_2' changes for Moodle 2.2+
authorJamie Pratt <me@jamiep.org>
Sat, 4 Feb 2012 11:27:11 +0000 (18:27 +0700)
committerJamie Pratt <me@jamiep.org>
Sat, 4 Feb 2012 11:27:11 +0000 (18:27 +0700)
commit533a0aa2be915d53b09db640656d0297def319b5
tree4648462f00040fef6d762e52d33af0226c431417
parent5283ee02c1abb6ee8536cdeb1f9e5396bb8e754c
parentf37cb12ed0c06f159282137eedd332beeed949a7
MDL-47494 gapselect: Merge branch 'diff_2_2' changes for Moodle 2.2+

Conflicts:
lang/en/qtype_gapselect.php
question/type/gapselect/lang/en/qtype_gapselect.php
question/type/gapselect/simpletest/testquestiontype.php