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

Simple merge