Merge branch 'MDL-54867-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:25:54 +0000 (20:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:25:54 +0000 (20:25 +0200)
1  2 
webservice/upload.php

Simple merge