Merge branch 'MDL-56767-master-fix' of https://github.com/lameze/moodle
commita0c3ab0b30142b63de35363af2b87cd59066cadc
authorDan Poltawski <dan@moodle.com>
Thu, 17 Nov 2016 08:51:18 +0000 (17 08:51 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 17 Nov 2016 08:51:18 +0000 (17 08:51 +0000)
tree0c0439baac14d03254b250a33785a3b3a0986911
parent820a43510f4ab1500b1b2a0ad3ec297510726435
parent7508e218d26610c71409f4d51a1806cf4d651523
Merge branch 'MDL-56767-master-fix' of https://github.com/lameze/moodle