Merge branch 'MDL-26882-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 23:40:29 +0000 (11:40 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 23:40:29 +0000 (11:40 +1200)
1  2 
user/profile.php

Simple merge