Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 10 Apr 2014 15:20:49 +0000 (17:20 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 10 Apr 2014 15:20:49 +0000 (17:20 +0200)
commit79f108b14e7944ddc4669e9c03fc34b40a3a2288
treebdd15bf2f3dd7b667d803bfe84177c31ebfb37c8
parent7685b7a9e5b3f6db6832e52e111000ff36d3acb4
parentd7aab66192b34473a8b12f31113ce7cf8b61b9a9
Merge branch 'mainstream'

Conflicts:
lib/dpif-netdev.c
lib/netdev.c
.gitignore
Makefile.am
lib/automake.mk
lib/dpif-netdev.c
lib/dpif-provider.h
lib/dpif.c
lib/netdev-pltap.c
lib/netdev-provider.h
lib/netdev-tunnel.c
lib/netdev.c