Skip to content
Commit 7f5ad4ad authored by Maximiliano Curia's avatar Maximiliano Curia
Browse files

Merge commit 'f672a598' 

Conflicts:
	debian/control
	debian/rules
parents 4ba51905 f672a598
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