Merge branch 'MDL-56131-master' of git://github.com/andrewnicols/moodle
commitcfa69ad26061e2caafb34c4bddd7b06ff5a4c0d5
authorDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 12:44:33 +0000 (18 13:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 12:44:33 +0000 (18 13:44 +0100)
treec7ebc3cf89c73da694b40ecdcff59305e8fc1cb4
parentc0b1f18930ab8c13db93c141548f70b67d094c55
parent0c5994269f9c252d25277f647dfbf1673ee7e076
Merge branch 'MDL-56131-master' of git://github.com/andrewnicols/moodle