Merge branch 'm23_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 22 Jul 2012 23:38:09 +0000 (11:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 22 Jul 2012 23:38:09 +0000 (11:38 +1200)

Trivial merge