Merge branch 'MDL-58637_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 06:27:56 +0000 (07:27 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 06:27:56 +0000 (07:27 +0100)
commitfd91fe42caac2cd6346e7d38fe67d73e5dc9e81a
tree7f14040ff546985458c32a482abd59050ab109f1
parent13e58982bbf8585a4fa0d19a0fc8e96e0982106b
parent2c77be65ccd298032c4b3f9b320f9a0c55bfb6c3
Merge branch 'MDL-58637_master' of git://github.com/markn86/moodle