Merge branch 'w29_MDL-22584_m22_monsterpaths' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 03:18:21 +0000 (11:18 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 03:18:21 +0000 (11:18 +0800)

Trivial merge