From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Fri, 8 Oct 2010 08:48:15 +0000 (+0200)
Subject: Merge branch 'vpn-nat'
X-Git-Tag: v2.6~100
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=0bc951d145b884c92077d0ef701c7ad9f84637c3;p=libi2ncommon

Merge branch 'vpn-nat'
---

0bc951d145b884c92077d0ef701c7ad9f84637c3