Skip to content
Commit b2fe5d0e authored by Timo Aaltonen's avatar Timo Aaltonen
Browse files

Actually merge the upstream version. (Closes: #917556)

parent 4fe2f08b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment