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

Merge tag 'v1.0-1' into debian-squeeze 

Conflicts:
	debian/changelog
parents d8bb1185 343a0b47
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