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

Merge branch 'debian' into debian-squeeze 

Conflicts:
	debian/changelog
parents cf4a387d 3eab7532
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