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

Merge remote-tracking branch 'origin/kubuntu_vivid_archive' 

Conflicts:
	debian/control
	debian/libkf5auth-data.install
	debian/libkf5auth-dev.install
parents 6bb7ad8d 674cfba1
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