From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Sat, 6 Jul 2013 17:51:05 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
X-Git-Tag: sliver-openvswitch-1.11.90-1~1
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=a17fcaaf580b6d8d26f4906237ddec837358708c

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

Conflicts:
	sliver-openvswitch.spec
---

a17fcaaf580b6d8d26f4906237ddec837358708c