Merge branch 'MDL-57009-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Feb 2017 12:32:34 +0000 (12:32 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Feb 2017 12:32:34 +0000 (12:32 +0000)
commitcf8c463de6286a7de90fefbd36bc2d0434bf305e
treeeab817b332d5f373a0eb46be9d352661517af897
parent125fa38af30d60330dabe5feea7917383f8d40b2
parent3d6ae65b6134fa1f4531ba054686d1450891cfc9
Merge branch 'MDL-57009-master' of git://github.com/damyon/moodle