Merge branch 'MDL-56136' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 19:44:42 +0000 (20:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 19:44:42 +0000 (20:44 +0100)
commita3605942596ab8147993aff253e6da77a9c19763
tree34eb336170f52380fa0b02fbe4be93e7380aff41
parent7af5ad97c1922d193b7b10c0238a9a4850463c8f
parent70e85280f4abebc298e27a24099b655475d5ed3b
Merge branch 'MDL-56136' of git://github.com/timhunt/moodle