Merge branch 'MDL-35978-31' of https://github.com/snake/moodle into MOODLE_31_STABLE
commit1a52d63ea98ca2f7d6c4fd0b23270376bbb954c4
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:54:15 +0000 (30 09:54 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:54:15 +0000 (30 09:54 +0000)
tree720bc89759a9dd71c495ba26bada2c45b6836565
parent78d40d3e6d997077d33aff0017f2c645751b5b13
parent9660b5f47168ff7e4581d3898ac1c5481c077043
Merge branch 'MDL-35978-31' of https://github.com/snake/moodle into MOODLE_31_STABLE