Merge branch 'MDL-37697-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 20:02:32 +0000 (09:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 20:02:32 +0000 (09:02 +1300)

Trivial merge