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)

Trivial merge