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

Merge branch 'master' of git://git.debian.org/pkg-kde/meta-kde 

Conflicts:
	debian/control
	debian/rules
parents c820c56b 8a7e1690
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