Merge branch 'MDL-44630_CC_Changes' of git://github.com/moodlerooms/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 8 May 2014 04:05:20 +0000 (12:05 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 8 May 2014 04:05:20 +0000 (12:05 +0800)

Trivial merge