Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 28 Aug 2013 15:28:10 +0000 (17:28 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 28 Aug 2013 15:28:10 +0000 (17:28 +0200)
1  2 
lib/automake.mk
lib/netdev-provider.h
lib/netdev.c

diff --cc lib/automake.mk
Simple merge
Simple merge
diff --cc lib/netdev.c
Simple merge