Merge branch 'wip-MDL-27177-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Aug 2015 08:54:40 +0000 (09:54 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Aug 2015 08:55:00 +0000 (09:55 +0100)
commitf1352da1ba0ceb3b057bb4382f566080e5de5d17
treeb9a8fe42cff4d14a6e9fdd4cca8b665f64a36040
parent7ac0ddd00a72c45820d6ca14b617bf100cf105a5
parent4fc7b6a07bf4f872e9b9d07700b6c2e11465d52f
Merge branch 'wip-MDL-27177-master' of git://github.com/abgreeve/moodle
user/lib.php