Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle
commit21f7b01d19eac3450c89aba064130c48db7fa6dc
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 01:26:38 +0000 (30 13:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 01:26:38 +0000 (30 13:26 +1200)
treeb852546cef4d068198e3f2d102ea8e00da1a70ed
parentac3f3571a5505aec2afc88a1a1e1fc0dc0cee77e
parent7528e238e0860ed17aa791732f5a5bd320b20483
Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle