Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 20 Dec 2012 15:40:50 +0000 (16:40 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 20 Dec 2012 15:40:50 +0000 (16:40 +0100)
commitea4392e3e885dff9e41d89a061cf7f2670e436ad
tree454bf2fd5013d962f33a70d196278c670e8ec839
parenta80110ed6c203096ed9ca7834768957d3e6c0fe9
parent59af549f66c770a9c76a4f00d10abf5dd2009f6e
Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

Conflicts:
lib/netdev-pltap.c