Merge branch 'w02_MDL-31005_m23_contextlevelname' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Jan 2012 03:12:24 +0000 (16:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Jan 2012 03:12:24 +0000 (16:12 +1300)

Trivial merge