Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 21 Jan 2014 15:40:17 +0000 (16:40 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 21 Jan 2014 15:40:17 +0000 (16:40 +0100)
Conflicts:
sliver-openvswitch.spec

1  2 
sliver-openvswitch.spec

Simple merge