Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Fri, 25 Oct 2013 20:15:00 +0000 (22:15 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Fri, 25 Oct 2013 20:15:00 +0000 (22:15 +0200)
commit2431be1b68d386bd616378d2c528242775c4d54a
tree6ceba5696d3dee27627d658160683775a7898cd3
parent093f56c5c5c8b0891e837beb1defd84bc165ac6a
parent6647cb8ce75dfcb2bfd2b2c858eb789bd349687a
Merge branch 'mainstream'
Makefile.am
lib/automake.mk
lib/dpif-netdev.c