Merge branch 'MDL-58776_master-fix' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 17 May 2017 11:11:56 +0000 (12:11 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 17 May 2017 11:11:56 +0000 (12:11 +0100)
commit2e34848348e1c5c580856996d81c4015951f2ebf
tree24c99e61dc0b747a64796bd957df760d05e6bf8a
parentb991325da2086cd9ab87c3cc616910fd1b3e8ec6
parentf92e27d84ec51ba1b4ace2e9dbb37e146b5c3623
Merge branch 'MDL-58776_master-fix' of https://github.com/markn86/moodle