Merge branch 'w46_MDL-30294_m22_errorsinthemefiles' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 23:48:06 +0000 (12:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 23:48:06 +0000 (12:48 +1300)

Trivial merge