Merge branch 'packaging' into openSUSE-13.1
authorMichal Marek <mmarek@suse.cz>
Fri, 27 Sep 2013 21:51:56 +0000 (23:51 +0200)
committerMichal Marek <mmarek@suse.cz>
Fri, 27 Sep 2013 21:51:56 +0000 (23:51 +0200)
commitc0a0cbfb743e439c8fff3b95fe1671a3a459ac18
treece855fc747b674b7a663fbdd652acfa4cbcb46fe
parent83e7e53076d9b1e55850eb44df36511e654660f6
parent221133cf579bda35a47c3319fb3376b60a024209
Merge branch 'packaging' into openSUSE-13.1

Conflicts:
rpm/kernel-binary.spec.in