git://git.onelab.eu / sliver-openvswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a80110e 59af549)
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)
Conflicts:
lib/netdev-pltap.c


Trivial merge
sliver-openvswitch