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)
commit057c2f8d06d51e1c0bde7195c88127cf7de8a48d
treed5e22cdb0bba43cfee716fbcc38ebb5adb20485d
parentee917603216827e83ec218e5fd3d9eb6f35d6383
parentf2eac756244ccea363231c6bc99cded6b583b2d5
Merge branch 's13_MDL-29170_risklevel_master' of git://github.com/dongsheng/moodle