Merge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)
commitf88481954652a237d79d7d6d143121740da564ca
treea64778cac2f03df37932297d561aa20345938fe8
parentd07f3425cab8ffe3098063aec74dc251d8cf653b
parentd17ba1e1a5d6ff4b3ddfd0cb025ee0d50465996a
Merge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle
theme/base/style/user.css
user/profile.php