Merge branch 'wip-MDL-57366-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE
commit9ff6b6d5fa1d7745d8c06c0675cb65e78a796650
authorDan Poltawski <dan@moodle.com>
Wed, 28 Dec 2016 15:05:59 +0000 (28 15:05 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Dec 2016 15:05:59 +0000 (28 15:05 +0000)
tree68de2f8bc1cfd0d13ffd3e1b404e91b4ffbc2892
parentc5be0c6b22504febbf2f0b66e1117f297c9a99f6
parent4f2c239ea4b7f66597ebeb7285028deb127744d0
Merge branch 'wip-MDL-57366-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE