Merge branch 'w24_MDL-32480_m23_imscp' of git://github.com/skodak/moodle into MOODLE_...
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 02:39:54 +0000 (14:39 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 02:39:54 +0000 (14:39 +1200)
commitf83cd734f972997187687978e97368e2cbbc5887
treeae3926a2542e639ed8d9cb93bf2a848f6cc52367
parentad6976aae575a8c05d21edd78da96c3ce3e0aad0
parent663e3ce8b2e7c27771548cdb06d2a9a6e3d15f94
Merge branch 'w24_MDL-32480_m23_imscp' of git://github.com/skodak/moodle into MOODLE_23_STABLE