Merge branch 'wip-MDL-37901_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Mar 2013 02:23:09 +0000 (15:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Mar 2013 02:23:09 +0000 (15:23 +1300)

Trivial merge