Merge branch 'w18_MDL-32676_m23_yuibootstrap' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:26:07 +0000 (12:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:26:07 +0000 (12:26 +1200)

Trivial merge