Merge branch 'w31_MDL-28382_m22_iis' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:20:15 +0000 (10:20 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:20:15 +0000 (10:20 +0800)

Trivial merge