From: Gerd von Egidy Date: Thu, 7 Oct 2010 15:25:42 +0000 (+0200) Subject: Merge branch 'master' into vpn-nat X-Git-Tag: v2.6~100^2 X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=af4f919edcb65c9c47ce30c8916fbf2a8c4ffec1;p=libi2ncommon Merge branch 'master' into vpn-nat Conflicts: packages/iptables/iptables.spec packages/strongswan/strongswan.spec update_cnf/src/Makefile.am --- af4f919edcb65c9c47ce30c8916fbf2a8c4ffec1