Skip to content
Commit 6e7b0519 authored by Maximiliano Curia's avatar Maximiliano Curia
Browse files

Merge remote-tracking branch 'origin/kubuntu_vivid_archive' 

Conflicts:
	debian/changelog
	debian/control
parents ae45d405 6f3c6aef
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