Skip to content
Snippets Groups Projects
Commit accd8215 authored by Michael Vogt's avatar Michael Vogt
Browse files

Merge branch 'debian/jessie' into ubuntu/master

Conflicts:
	configure.ac
	debian/changelog
parents b32f5e0d 4694e07d
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment