Skip to content
Commit 7cc00977 authored by Scarlett Clark's avatar Scarlett Clark
Browse files

Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable 

Conflicts:
	debian/changelog
	debian/control
parents dda8cf55 bce4752d
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