Merge branch 'wip-MDL-57464-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE
commit28bb924937265c039f14fdbd45cb40962cad164a
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 11:16:22 +0000 (2 11:16 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 11:16:22 +0000 (2 11:16 +0000)
tree6cfb5914337b291684a09234e784dea08ffc9eac
parent3b95075dddaa04fec734bac29ac666e8704ae661
parentc27a165ccf50cccf8b8c01cf31a36115cf628ca8
Merge branch 'wip-MDL-57464-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE