Merge branch 'MDL-55955_31' of git://github.com/markn86/moodle into MOODLE_31_STABLE
commit977b92dd0b812ffcde37f85d84843ec83ada4be0
authorDan Poltawski <dan@moodle.com>
Wed, 28 Dec 2016 15:11:58 +0000 (28 15:11 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Dec 2016 15:11:58 +0000 (28 15:11 +0000)
tree8d5d6a479eb622c0716940aea3a805c0c4547e84
parent9ff6b6d5fa1d7745d8c06c0675cb65e78a796650
parent84f6435a1424aea54f271e991a1d7d2ff8718300
Merge branch 'MDL-55955_31' of git://github.com/markn86/moodle into MOODLE_31_STABLE