Skip to content
Commit 60040353 authored by Rohan Garg's avatar Rohan Garg
Browse files

Merge branch 'master' into kubuntu_unstable 

Conflicts:
	debian/changelog
	debian/control
parents 668f9591 439ce447
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