]> git.infradead.org Git - users/dwmw2/vpnc-scripts.git/commitdiff
Merge branch 'vpnc-script' of git://github.com/falconindy/vpnc-scripts
authorDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 17 Aug 2011 12:58:46 +0000 (13:58 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 17 Aug 2011 12:58:46 +0000 (13:58 +0100)
1  2 
vpnc-script

diff --cc vpnc-script
Simple merge