Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 19:48:08 +0000 (08:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 19:48:08 +0000 (08:48 +1300)
commitbb4551334fb3a3312bab9bbc3f9556891e9a677c
treeff0b8725bc15f4adf26efaee1f20c7d1d2fca0ea
parent2b08f90aca1e8417647b1f6aa49fcec0e19ff0b9
parent871015414d772fd4cc3d6e647316a30071f15319
Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle
mod/assignment/type/uploadsingle/assignment.class.php