Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sun, 2 Mar 2014 16:11:50 +0000 (17:11 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sun, 9 Mar 2014 15:03:52 +0000 (16:03 +0100)
commit3ba9c6a5a5468626dcfeb1f9a750bb0efc8c6a7a
tree6abc59c8c1df1dfb0982bb8a59eac8b2fe2081c6
parentdb19b72b9f6d0d40b743214241d9666116e3b448
parent87972a8fcd0f339c7229a014edd4c75fd9c1356c
Merge branch 'mainstream'

Conflicts:
lib/dpif-netdev.c
lib/automake.mk
lib/dpif-netdev.c
lib/dpif-provider.h
lib/dpif.c