Skip to content
Commit 5f90c2f7 authored by Richard Hartmann's avatar Richard Hartmann
Browse files

Merge branch 'debian' into debian-wheezy 

Conflicts:
	debian/changelog
parents 19ce2da4 0119fa57
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment