Merge branch 'master' into hvm

This commit is contained in:
Marek Marczykowski 2012-02-27 15:14:21 +01:00
commit c3356296a5

View File

@ -1066,7 +1066,7 @@ class QubesVm(object):
rule["netmask"] = 32
# For backward compatibility default to tcp
if rule["proto" is None:
if rule["proto"] is None:
rule["proto"] = "tcp"
if rule["port"] is not None: