Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 7 Oct 2013 10:34:23 +0000 (12:34 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 7 Oct 2013 10:34:23 +0000 (12:34 +0200)
commitb2f2acd543f159ba984a00059892917933612a10
treee577f11569c17e2cd763ef7cbf8c3e128a3a81ad
parent86c1d8dcc38489c9b04ec242a14f6ec64c81fb24
parenta34779bcbe9a4fd568bdcd414ee0416c208dbf22
Merge branch 'mainstream'
lib/automake.mk
lib/dpif.c