Merge branch 'wip-mdl-33425' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 19 Jun 2012 23:32:04 +0000 (11:32 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 19 Jun 2012 23:32:04 +0000 (11:32 +1200)
1  2 
user/editlib.php

Simple merge