Merge branch 'MDL-56841' of https://github.com/andrewhancox/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Feb 2017 16:22:34 +0000 (16:22 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Feb 2017 16:22:34 +0000 (16:22 +0000)
commitcb0081661024324001166684acd0b0c8473b9248
tree01f261aee6d8020156812caf099d98a7f01cf7cc
parent5c3e1eedb758ed418059592ab22db0ba12bc17e9
parent26ca6df76ade18e4777c3322c7bd06b36926c32a
Merge branch 'MDL-56841' of https://github.com/andrewhancox/moodle