Skip to content
Commit 23ab44ee authored by Scarlett Clark's avatar Scarlett Clark
Browse files

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

Conflicts:
	debian/changelog
	debian/control
parents cf442381 5691fbde
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