added section to solve vpn conflicts
authorMatthias Wachs <wachs@net.in.tum.de>
Tue, 10 Jan 2012 15:54:49 +0000 (15:54 +0000)
committerMatthias Wachs <wachs@net.in.tum.de>
Tue, 10 Jan 2012 15:54:49 +0000 (15:54 +0000)
commit19fe4bde52ad570148183709818fd82eba4f83d1
treefabd9f2f3a6d63e90165fe99dfd8c8a464a316a2
parent4cd9ad92ad6131400e52dc1f25516b4134150aef
added section to solve vpn conflicts
src/integration-tests/confs/c_bootstrap_server.conf
src/integration-tests/confs/c_nat_client.conf
src/integration-tests/confs/c_no_nat_client.conf