Merge branch 'wip-MDL-15930-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 19:34:42 +0000 (20:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 19:34:42 +0000 (20:34 +0100)
commit5afd8bfedee694a844377c84212eb4f953451d28
treedf7bad428e7ff144d11561be24ba49dc3f6c0ef6
parent31a783303e8ffc0ec7afecc370964c725a92fae5
parent1a1919412196174c7d967d3e5ba6037fe05147ee
Merge branch 'wip-MDL-15930-master' of git://github.com/abgreeve/moodle
admin/user.php