Merge branch 'MDL-58772' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 00:26:26 +0000 (08:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 00:26:26 +0000 (08:26 +0800)
commitc428f58a3abd093be6dabc856981b9c16dbde7b7
tree3b04b8078fce34cf6b84ca374ebad9cb886c51c3
parent5e7de08be505246c0417c8190b95f38997565830
parentda60573291937fc671369103f5b214aeb11e704c
Merge branch 'MDL-58772' of git://github.com/stronk7/moodle