Merge branch 'wip-MDL-51283-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 09:40:39 +0000 (17:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 09:40:39 +0000 (17:40 +0800)
1  2 
user/editlib.php

Simple merge