Skip to content
Commit 8010fe68 authored by Samuel Thibault's avatar Samuel Thibault
Browse files

Merge remote-tracking branch 'alioth/master' into debian 

Conflicts:
	debian/changelog
	debian/control
parents ea86a81d b8ac7c95
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