Merge branch 'MDL-36763-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE...
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Nov 2012 22:42:13 +0000 (11:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Nov 2012 22:42:13 +0000 (11:42 +1300)

Trivial merge