Merge branch 'MDL-46946-master-reqcusfield' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 00:12:59 +0000 (02:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 00:12:59 +0000 (02:12 +0200)
1  2 
lib/moodlelib.php
user/editlib.php

Simple merge
Simple merge