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)
commitfe29af4c888d48cc1f16b1a247c2ffb6f0864522
treeed6b814847f51198ddadf5ca4f5b18ff27a72cae
parent1e827902be9194d71ea851c9ce2676f65eeed33a
parent4b0424809b823101c969a0691fc1db0c880ae64a
Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

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