Merge branch 'MDL-30738' of git://github.com/kiklop74/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 00:59:46 +0000 (01:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 00:59:46 +0000 (01:59 +0100)
1  2 
user/index.php

diff --cc user/index.php
Simple merge