Merge branch 'w43_MDL-36145_m24_yui373' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 31 Oct 2012 04:35:18 +0000 (17:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 31 Oct 2012 04:35:18 +0000 (17:35 +1300)

Trivial merge