Merge branch 'MDL-55464_m32v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 13:20:31 +0000 (14:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 13:20:31 +0000 (14:20 +0100)
commit298dd2f074b4fe42d6917c55f42cf8dd37c49050
tree64c174975c472d242b9438781e504454a4fbbe25
parent017230d576194006ba1258a622f7929047aacc7c
parent9f03fc3119b361bcba379b50471ce11d8c0980bf
Merge branch 'MDL-55464_m32v1' of https://github.com/sbourget/moodle