Merge branch 'w40_MDL-29686_m2_yuicaching' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 23:20:38 +0000 (12:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 23:20:38 +0000 (12:20 +1300)

Trivial merge