Skip to content
Commit 28e174af authored by Maximiliano Curia's avatar Maximiliano Curia
Browse files

Merge remote-tracking branch 'origin/kubuntu_vivid_archive' 

Conflicts:
	debian/control
	debian/tests/control
parents 17a04a2a 3ad8c8da
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