Merge branch 'MDL-56514-master-fix1' of https://github.com/lameze/moodle
commit0cbba932062c813bdc6e8fa1d96a697affe7e10c
authorDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 08:43:09 +0000 (1 08:43 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 08:43:09 +0000 (1 08:43 +0000)
tree96143e75f569962f644e8b23f3b260f8453a0e7e
parent326b285467c9608a1ddc576f0b001debf5b763e4
parent56fa3e011aa296e8ce83b6d7135b016c0d1dbd0e
Merge branch 'MDL-56514-master-fix1' of https://github.com/lameze/moodle