Merge branch 'MDL-30472-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 06:34:42 +0000 (14:34 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 06:34:42 +0000 (14:34 +0800)
1  2 
user/index.php

diff --cc user/index.php
Simple merge