Merge branch 'MDL-42696-collator' of git://github.com/mudrd8mz/moodle
commit27199cfce84610561d90ce33c71581df660fcac9
authorMarina Glancy <marina@moodle.com>
Thu, 7 Nov 2013 01:59:36 +0000 (7 12:59 +1100)
committerMarina Glancy <marina@moodle.com>
Thu, 7 Nov 2013 01:59:36 +0000 (7 12:59 +1100)
treee82da5cbcb011d949d7948aba14efb8abd0a3407
parent02c6bd358f98404e0ff4f4a99fe0dd5b06f537ad
parent39fb6afa47a98df3212f7e851203ff380c638406
Merge branch 'MDL-42696-collator' of git://github.com/mudrd8mz/moodle