Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 6 Jul 2013 17:51:05 +0000 (19:51 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 6 Jul 2013 17:51:05 +0000 (19:51 +0200)
Conflicts:
sliver-openvswitch.spec

1  2 
sliver-openvswitch.spec

Simple merge