Merge branch 'w09_MDL-26564_20_uploadusers' of git://github.com/skodak/moodle

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 1 Mar 2011 18:02:04 +0000 (19:02 +0100)

committer Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 1 Mar 2011 18:02:04 +0000 (19:02 +0100)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2011 18:02:04 +0000 (19:02 +0100)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2011 18:02:04 +0000 (19:02 +0100)
diff --cc admin/uploaduser.php

index c2be9f1,1861a5d..1861a5d

mode 100644,100755..100644
--- 1/admin/uploaduser.php
--- 2/admin/uploaduser.php
+++ b/admin/uploaduser.php
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 1 Mar 2011 18:02:04 +0000 (19:02 +0100)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 1 Mar 2011 18:02:04 +0000 (19:02 +0100)