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

Merge branch 'master' into kubuntu_unstable

Conflicts:
	debian/changelog
	debian/control
parents e8951515 99029214
Loading
Loading
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