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)
commita5537e770d43b4553dc13904ffdd3569093f7b82
tree49f466f7a882df05a9a70072edb2d2b2b8780020
parentd5aea30d0c0c7b0a6bead8c039534b17ba495e9f
parenta4c20047e46224b0ae1f89d3ffb0b42e77dec1ab
Merge branch 'scripts'

Conflicts:
scripts/check-cvs-add