Merge branch 'MDL-51656_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Oct 2015 07:24:18 +0000 (15:24 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:34 +0000 (16:31 +0100)
commit358827f0b3493a89792055255f94edfdbcbe5165
tree4986b103c54d941384f87046780a232e6cbb9675
parented845fa7feda8af58eeb1d58af0fe6acd697d5d0
parente84b1eba3de4d97f4ee89a25817b96bc0b9cab3c
Merge branch 'MDL-51656_master' of git://github.com/markn86/moodle