git.onelab.eu Git - sliver-openvswitch.git/commit

author	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Fri, 3 Jan 2014 11:01:47 +0000 (12:01 +0100)
committer	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Fri, 3 Jan 2014 11:01:47 +0000 (12:01 +0100)
commit	4b0424809b823101c969a0691fc1db0c880ae64a
tree	78a7891b2f4ff6a3d96cc9dda19eb4ba68e2c1fe	tree \| snapshot
parent	d010a5eef1e589b1ee517548a1e4d4f1c1f795d1	commit \| diff
parent	21e70add7e5fc18c519ca3d46691230bf136b1e1	commit \| diff

Merge branch 'mainstream'

Conflicts:
Makefile.am

sliver-openvswitch