Merge branch 'MDL-34591_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:48:33 +0000 (10:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:48:33 +0000 (10:48 +1300)

Trivial merge