Merge branch 'w16_MDL-17344_m21_uploadprof' of git://github.com/skodak/moodle
commite62ea95dfc05f76312c093b979b9d6099f2a852e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2011 09:02:09 +0000 (18 11:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2011 09:02:09 +0000 (18 11:02 +0200)
tree6b325f47d3a98c6ce77b6e726ea2c722dd0ee3f9
parent5d53a674b7681023e1252c007f53a7d9913b6c67
parent623966a396316b9ae82f60cae59d2899a3b317e5
Merge branch 'w16_MDL-17344_m21_uploadprof' of git://github.com/skodak/moodle