Skip to content
Commit 72482776 authored by Reinhard Tartler's avatar Reinhard Tartler
Browse files

Merge tag 'upstream/11' 

Upstream version 11

Conflicts:
	Changelog
	RELEASE
	VERSION
parents fc08012f 2bf4a382
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