Skip to content
Commit 43a7581a authored by Christoph Berg's avatar Christoph Berg 📡
Browse files

Merge branch 'jessie-updates' into master 

Conflicts:
	debian/changelog
	debian/patches/upstream/771125-CVE-2014-9116-jessie.patch
parents 5afbb6a3 30407c7b
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