Merge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 01:10:00 +0000 (14:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 01:10:00 +0000 (14:10 +1300)
commitdb6d54c337915f579e41b26086886d9a30410ce7
treeb48893475673faf9950b9d31ccd9fd59baa0ad86
parentfd9dbadb15258954a073c460cbcefe080e9dcd61
parent2ce6d12f58386117ba808ceedc6cc65aa1375a8b
Merge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle
mod/assignment/type/upload/assignment.class.php