Merge branch 'MDL-56768-master' of git://github.com/damyon/moodle
commita4b0cfa3f7d37952279933f02f42dff57991e0e7
authorDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 13:51:11 +0000 (10 13:51 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 13:51:11 +0000 (10 13:51 +0000)
tree40b940dbdb041cc888b202b21f23607c710d070c
parentd5d6eda93c96ac71686ddba5b66f1578e1f6232c
parent1572a39251f455a26664656db48d6e1cbb691790
Merge branch 'MDL-56768-master' of git://github.com/damyon/moodle