Merge branch 'MDL-42885_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE
commit35d228442380910680143cd4781d33f4beac319c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 09:02:00 +0000 (3 10:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 09:02:00 +0000 (3 10:02 +0100)
treebc1157f669941d8a1d6feb4ea77056fed4a2bf2a
parenta87ae3371d45160087ba093f0eba2e0ea1570d60
parent44a9508cb9111c03ee2f85b757ae0ba2c9ad0e32
Merge branch 'MDL-42885_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE
admin/tool/uploaduser/index.php