[Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

New commits:
commit 34c134a4c464df7663b20eb605ced26d2cf77989
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 6 23:15:10 2015 -0400

    pluto: don't refuse to load passthrough conn with ike= or esp= settings
    
    This causes problems when ike= or esp= is specified in conn %default