Merge branch 'MDL-50704-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 May 2016 14:59:41 +0000 (15:59 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 10 May 2016 14:59:41 +0000 (15:59 +0100)
1  2 
user/tests/userlib_test.php

Simple merge