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

Trivial merge