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)
commitb76ae3b0cea34c74b2a91425ece90585679c7cc8
treeb3f81c6a03e13b075126ec042a3e40062f5f3556
parentf69c0d572ec39f6790e9f37f8a71d414e5767f97
parente686494fbc7e55c46b0f365a188c1c42ba7cd193
Merge branch 'MDL-44630_CC_Changes' of git://github.com/moodlerooms/moodle