Merge branch 'MDL-37397-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 22:04:28 +0000 (11:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 22:04:28 +0000 (11:04 +1300)

Trivial merge