Merge branch 'MDL-18592-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 13:27:34 +0000 (14:27 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 13:27:34 +0000 (14:27 +0100)
commitc6970e9c16ce9d5fe417baab64b728bfea48b460
treef52cfa9605d84a064fd0a4121ad7a496f1b7c6a7
parent8d37a33b169eef6f0c3b26fc71c8faafb5c17e57
parent8676e7c3e0ac2a2b5f7eec2a83060fb73760cd47
Merge branch 'MDL-18592-master' of git://github.com/marinaglancy/moodle