Merge branch 'MDL-56582-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 13:49:50 +0000 (13:49 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 13:49:50 +0000 (13:49 +0000)
commitc624351e97ab44a6cded640301293037aeafcd2a
treec9bc2e7a00fceeca4753bad628bf3a64a3a22e40
parentebdd54f476f8ed0849d0a07614a0e742ef3a6752
parentd8cfd6114531d23c3553475591c5ffcb35f5aa99
Merge branch 'MDL-56582-master' of https://github.com/xow/moodle