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)
commita17fcaaf580b6d8d26f4906237ddec837358708c
tree5421307cef4b4079c61dea2c61343d747e273c09
parent2b92bb41f78622084452dcb647eef29bc16eb700
parentf80022d9df98d29ee41176a4bc6cb91025da84b8
Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

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