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)

Trivial merge