Merge branch 'MDL-26007_20_wip_enverror' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 07:34:43 +0000 (15:34 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 07:34:43 +0000 (15:34 +0800)

Trivial merge