Skip to content
Commit 2a9cc6bb authored by Samuel Thibault's avatar Samuel Thibault
Browse files

Merge branch 'debian-wheezy' 

Conflicts:
	debian/changelog
parents bbda4d33 7b9f5e03
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