Skip to content
Commit b0767dad 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 90705651 7cc00977
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