MDL-47494 gapselect: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes
authorJamie Pratt <me@jamiep.org>
Thu, 21 Jun 2012 06:42:52 +0000 (13:42 +0700)
committerJamie Pratt <me@jamiep.org>
Thu, 21 Jun 2012 06:42:52 +0000 (13:42 +0700)

Trivial merge