Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 05:23:31 +0000 (13:23 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 05:23:31 +0000 (13:23 +0800)
commitf9b5915bc0d3e74523458e58a2bc8344bb2db815
treeccf8ae9784d8c09e4979b128262ce0670af15719
parent387d040b7b62166f5e89f77c9b1e647e8719a064
parent0528361cc139d8da6cfa7b0b73a526350fa428c4
Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle
mod/workshop/locallib.php