Merge branch 'master' into vpn-nat
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 7 Oct 2010 15:25:42 +0000 (17:25 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 7 Oct 2010 15:25:42 +0000 (17:25 +0200)
commitaf4f919edcb65c9c47ce30c8916fbf2a8c4ffec1
tree54da3879e58d82091b87136dbaeda048bc8eee3e
parent9c9f4290fb0d6220b2e2c60b858028be07f1e118
parent7ac95d85188b7e4f04e6d5f0d8a90dd7f4a04c40
Merge branch 'master' into vpn-nat

Conflicts:
packages/iptables/iptables.spec
packages/strongswan/strongswan.spec
update_cnf/src/Makefile.am