From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Fri, 3 Jan 2014 11:01:47 +0000 (+0100)
Subject: Merge branch 'mainstream'
X-Git-Tag: sliver-openvswitch-2.1.90-1~9^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4b0424809b823101c969a0691fc1db0c880ae64a;hp=4b0424809b823101c969a0691fc1db0c880ae64a;p=sliver-openvswitch.git

Merge branch 'mainstream'

Conflicts:
	Makefile.am
---