Merge branch 'MDL-36805-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE...
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 20:14:59 +0000 (09:14 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 20:14:59 +0000 (09:14 +1300)

Trivial merge