Merge branch 'w04_MDL-26035_20_installtest' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 07:05:55 +0000 (15:05 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 07:05:55 +0000 (15:05 +0800)

Trivial merge