Merge branch 'MDL-34592_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:28:24 +0000 (14:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:28:24 +0000 (14:28 +1300)

Trivial merge