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)
commit52ad3afadb0f6b2ec231ecbd9068bad5b48b5915
tree2700cb85c1e6f0230350fd4a1a8fe8d2ebc79ce0
parent037d9918e1770e3f8376b457ef10d200c448949f
parent4be9c7ad99ebbb99ff002c0510b7dcd8f43a196e
Merge branch 'wip-MDL-51283-master' of git://github.com/marinaglancy/moodle
user/editlib.php