Merge branch 'wip-MDL-39099_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Apr 2013 23:04:33 +0000 (11:04 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Apr 2013 23:04:33 +0000 (11:04 +1200)

Trivial merge