MDL-47494 gapselect: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes
authorJamie Pratt <me@jamiep.org>
Thu, 21 Jun 2012 07:22:00 +0000 (14:22 +0700)
committerJamie Pratt <me@jamiep.org>
Thu, 21 Jun 2012 07:22:00 +0000 (14:22 +0700)
commit3505610d11497412422bdc7a25c049de692a0442
treeb09a9b833be497316953015cf0ac4b197c9fc11e
parentc48797ac2686fada6be156df952c504b194c2cef
parent5901152a052c8860c9ca34bcebc1339772ac8d71
MDL-47494 gapselect: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes

Conflicts:
lib.php
Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes

Conflicts:
lib.php
question/type/gapselect/lib.php