Merge branch 'wip-MDL-36915-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle...
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:27:07 +0000 (10:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:27:07 +0000 (10:27 +1300)

Trivial merge