Skip to content
Commit 96f7cc72 authored by ksamak's avatar ksamak
Browse files

Merge branch 'jessie-master' into jessie-kix-cursor-support

Conflicts:
	debian/changelog
parents 821e357d 59cdf3b4
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