Merge branch 'MDL-47569_CC_Errors' of git://github.com/moodlerooms/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 30 Oct 2014 08:15:51 +0000 (16:15 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 30 Oct 2014 08:15:51 +0000 (16:15 +0800)
commit89da9fa67b28fe21565888721b18c544e95359dc
tree7b21703f43049bafcc963eb100f3e187a0d6c52d
parent61138e352d7ab0a97b96d8d4e632e2d8639b5b08
parent292f663581a2f6e3a159df5437b3a004507c86b4
Merge branch 'MDL-47569_CC_Errors' of git://github.com/moodlerooms/moodle