Commit fe96870a authored by Guido Günther's avatar Guido Günther Committed by Guido Günther
Browse files

Merge branch 'master' into merge 

Conflicts:
	debian/changelog
	debian/patches/series
	debian/rules
parents 4cd547b4 dbc4da6a
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