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

Merge branch 'debian' into debian-squeeze 

Conflicts:
	debian/changelog
	debian/control
parents cec5c3d5 f40284ae
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