Merge branch 'MDL-41660-imscc-tempdir' of https://github.com/mpetrowi/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:14:57 +0000 (02:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:14:57 +0000 (02:14 +0200)

Trivial merge