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)
1  2 
mod/workshop/lib.php

Simple merge