Skip to content
Snippets Groups Projects
Commit 1ce8697b authored by Carsten Gräser's avatar Carsten Gräser
Browse files

Merge branch 'master' into releases/2.4 

This only contains commits that:
* were already cherry-picked
* were requests to be cherry-picked by Ansgar
  in preparation for integration into debian
parents 45f48a1d c988b45a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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