Merge branch 'MDL-57627-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:22:25 +0000 (08:22 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:22:25 +0000 (08:22 +0000)
commit0893bb0897f13adafd4d321d2c5496a1dbb3156b
tree2888fc4e1887899fc153fb02b8c58323930977af
parenta3936db57fb5dce6c74e8a976f941af914fd3b34
parent4669389d1a641b1fe5d095f1468f468d8bfa5e3b
Merge branch 'MDL-57627-master' of git://github.com/crazyserver/moodle