Merge branch 's13_MDL-29170_risklevel_master' of git://github.com/dongsheng/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 4 Sep 2011 23:12:10 +0000 (11:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 4 Sep 2011 23:12:10 +0000 (11:12 +1200)

Trivial merge