Merge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle
commitefe57105d6d6d5d28b4e2e9bd0e8a3c57be5ded9
authorDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 10:42:36 +0000 (15 10:42 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 10:42:36 +0000 (15 10:42 +0000)
tree82b5285eab5aa4ff84c5f95b53bfe709833a8096
parent5cfaecac47de9aa48902fc803d7b429e54bd5ece
parent7f6accd448c4d31cf4dabb7bf86f7ca866d02c76
Merge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle