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)
Conflicts:
sliver-openvswitch.spec

1  2 
sliver-openvswitch.spec

Simple merge