Merge branch 'MDL-58486' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 11:15:40 +0000 (12:15 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 11:15:40 +0000 (12:15 +0100)
commit48411a8843d53c869964bc71d2fa0bc77736c39b
tree615a4308aaa7d7919a712d0457c6a29545a71bd4
parentae86b0879a7a725ea75aa1d8884ea4724544d67b
parent2524990d09ea547c153873d34d558c585879f539
Merge branch 'MDL-58486' of git://github.com/timhunt/moodle