From: Giuseppe Lettieri Date: Sun, 16 Dec 2012 18:12:29 +0000 (+0100) Subject: Merge branch 'hotfix' into make-improv X-Git-Tag: sliver-openvswitch-1.9.90-2~10 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=7c690f462fec1af60d76c67fac226fc648ea9149 Merge branch 'hotfix' into make-improv Conflicts: sliver-openvswitch.spec --- 7c690f462fec1af60d76c67fac226fc648ea9149