Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 7 Oct 2014 02:08:48 +0000 (10:08 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 7 Oct 2014 02:08:48 +0000 (10:08 +0800)
commitae66542027682dc2b01e176e929e478c89d6bad7
tree509bffce6f9d67165dd51e069dcf6d44d49c7549
parent3ba4e595fb5cffd6cd7f486521a063dea6dfe0b6
parent16d364b560e0f31bd3e08c040239802703d2087c
Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle
mod/workshop/lib.php