Merge branch 'packaging'
authorMichal Marek <mmarek@suse.cz>
Fri, 27 Sep 2013 21:50:03 +0000 (23:50 +0200)
committerMichal Marek <mmarek@suse.cz>
Fri, 27 Sep 2013 21:50:03 +0000 (23:50 +0200)
commit976e13e0f56f612c3048f023fbdeac82743e1046
tree92129b0d835acb0e5fd7df6fe4086b0eb11e0d40
parentff1e29fa2f7dd11f924096c5e7bab599e19bcba9
parent221133cf579bda35a47c3319fb3376b60a024209
Merge branch 'packaging'

Conflicts:
rpm/kernel-binary.spec.in