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

[Paul Wouters]

New commits:
commit 35449b88f1c9dad3d4df9e7d603c381a5f80bd19
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jun 24 16:23:54 2015 -0300

    pluto: Fix connection.c to not apply various IKE options for conns that never negotiate
    
    This fixes an odd error when using ike= or esp= in conn %default and you
    are trying to load a type=passthrough connection as well.