Commit 7487c313 authored by Marko Mäkelä's avatar Marko Mäkelä

Merge 10.4 into 10.5

This fixes up 4eb8e51c
which missed a second parent.
parents 4eb8e51c 07a06022
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment