Merge branch 'MDL-54862-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 07:06:35 +0000 (08:06 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 07:06:35 +0000 (08:06 +0100)
commit05a9c36edc4852a9ed8198d03ea40620c8722472
tree96726df2e5499d4d0544cd626fe4ed684fa156e5
parent5fa90114d7aa48fb121e82a5d80eb3113471e338
parent33ef5cdcf98e46796b5b1f6fd4d8bb7799b6ca85
Merge branch 'MDL-54862-master' of git://github.com/dpalou/moodle