Skip to content
Commit 44382136 authored by Julien Cristau's avatar Julien Cristau
Browse files

Merge remote branch 'origin/multiarch' into debian-unstable 

Conflicts:
	debian/control
	debian/rules
parents c1ab9be8 a3853a05
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