Merge branch 'MDL-54891-master' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jul 2016 09:38:56 +0000 (10:38 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jul 2016 09:38:56 +0000 (10:38 +0100)
commit120f4ed7eecefac856ce01ef5d3f236d35132b5a
treeb523166e5ef8ede75872a1b862d7fa7416fa2a1e
parent815abdf4db95c794eb87c08b9b969fc6f2564aa9
parent03064d6a89da140590b31eb2b5cd00eafd94ac2f
Merge branch 'MDL-54891-master' of git://github.com/ryanwyllie/moodle