Merge branch 'hotfix' into make-improv
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sun, 16 Dec 2012 18:12:29 +0000 (19:12 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sun, 16 Dec 2012 18:12:29 +0000 (19:12 +0100)
commit7c690f462fec1af60d76c67fac226fc648ea9149
tree184b22920df523e7ba4171a974a2acc7aeaeccee
parentc73c1d169d14c411a1571a3783f9b89aafc54577
parenta24da0658da71d84862f81f8538cb5f6c2d4f7a1
Merge branch 'hotfix' into make-improv

Conflicts:
sliver-openvswitch.spec
sliver-openvswitch.spec