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

author	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Tue, 26 Jun 2012 12:16:32 +0000 (14:16 +0200)
committer	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Tue, 26 Jun 2012 12:16:32 +0000 (14:16 +0200)
commit	b22426cc6f9cb45ffedde0ae0c9f94b12c0d0f86
tree	6e6935bca44b59eafde5e029b1c93a1e8306ebeb	tree \| snapshot
parent	192c395d4d703acf3700f79e680bc01a224d0de4	commit \| diff
parent	1b9b532b61a59acda0369021afd1eb9743362d9e	commit \| diff

Merge branch 'ovs-dev', remote branch 'origin' into bsd-port

sliver-openvswitch