Merge branch 'MDL-31934_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 21:15:29 +0000 (10:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 21:15:29 +0000 (10:15 +1300)

Trivial merge