Merge branch 'packaging' into SLE12
authorMichal Marek <mmarek@suse.cz>
Tue, 1 Jul 2014 15:15:56 +0000 (17:15 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 1 Jul 2014 15:15:56 +0000 (17:15 +0200)
commitacb96f009d80d6ddb2f92c17ab71feca648f413d
tree15a0e4c61dae592a1f4ecdf78f4a8471dea22a8d
parenta2b07c54e7ef111a0668d7ba4dc3c0df8d96fad1
Merge branch 'packaging' into SLE12

Conflicts:
rpm/kernel-source.spec.in

suse-commit: 769b21f8577d90e24f619cd3335cc94d789903a7