Merge branch 'MDL-57588' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jan 2017 11:39:05 +0000 (11:39 +0000)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:01:27 +0000 (13:01 +0800)
commit326efc7c66f1d06c2512b01256ba227a54056e69
tree1780a68e0ed44a796dc47ea5b9d9f48d8da68b15
parent8cf4591a8e38723016d4fd05734fcce917d0e887
parent2d708a7365147376d7f580b9f99fc32e2fc94d96
Merge branch 'MDL-57588' of git://github.com/timhunt/moodle