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

Merge branch 'debian' into debian-wheezy 

Conflicts:
	debian/changelog
parents 32cad6db 560edf83
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