Merge branch 'w16_MDL-32405_m23_estrict4' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 05:31:45 +0000 (17:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 05:31:45 +0000 (17:31 +1200)

Trivial merge