From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Tue, 21 Jan 2014 15:40:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
X-Git-Tag: sliver-openvswitch-2.1.90-1~9
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=fe29af4c888d48cc1f16b1a247c2ffb6f0864522

Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

Conflicts:
	sliver-openvswitch.spec
---

fe29af4c888d48cc1f16b1a247c2ffb6f0864522