Merge branch 'MDL-56178-master' of git://github.com/FMCorz/moodle
commit6a694f9a950eb7aa203952dd8e65d915bdcceddb
authorDan Poltawski <dan@moodle.com>
Mon, 10 Oct 2016 10:22:16 +0000 (10 11:22 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Oct 2016 10:22:16 +0000 (10 11:22 +0100)
tree78d1310989a9743c0c71a913fc18b1824ce97f0c
parent49e12de63fc00824bd5d0a76ee058f1791a3c905
parent5d2f105e504a0e77b412c20eaa9142b517a80356
Merge branch 'MDL-56178-master' of git://github.com/FMCorz/moodle