Merge branch 'scripts'
authorMichal Marek <mmarek@suse.cz>
Tue, 25 Feb 2014 15:56:20 +0000 (16:56 +0100)
committerMichal Marek <mmarek@suse.cz>
Tue, 25 Feb 2014 15:56:20 +0000 (16:56 +0100)
commit58eccbb4afba43b1e51cf19c004e46dfe216615d
treec3053bb6ac400a6918e23dc76259bf489cc62a4b
parent2f6b8a5445bc09f4e71baef110064b7586d2c486
Merge branch 'scripts'

Conflicts:
scripts/check-cvs-add

suse-commit: a5537e770d43b4553dc13904ffdd3569093f7b82