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

Merge tag 'v1.20131229-1' into debian-wheezy 

Tag v1.20131229-1

Conflicts:
	debian/changelog
parents 47b72932 1d896540
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