Tidy output of rpm -q
Merge branch 'master' into development
update Archiva