Commit Graph

2 Commits

Author SHA1 Message Date
Tomasz Sterna
dab24a2090 Propagate qubes_netvm_external_ip up in ProxyVM. #116 2011-03-26 11:33:04 +01:00
Marek Marczykowski
d6181d21cf Merge commit 'e2d52a27e810522c41720bb17b1f4f52f1fe2e6a'
Conflicts:
	dom0/qvm-core/qubes.py
	fwvm/init.d/qubes_firewall
2011-03-11 23:32:13 +01:00