Merge branch 'MDL-35654_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 2 Oct 2012 20:53:11 +0000 (09:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 2 Oct 2012 20:53:11 +0000 (09:53 +1300)

Trivial merge