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

[Paul Wouters]

New commits:
commit f0328a91565c7a9951c9bc6b330ab15667e58fcd
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Oct 30 13:59:49 2015 +0100

    pluto: add support for CONNMARK using mark=
    
    This exposes CONNMARK= in the updown scripts. Note we currently do
    not yet use this for anything per default.

commit c4fe64f258c77bb7df77db4aeb3d32c495b5c0c0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Oct 29 18:17:08 2015 +0100

    libipsecconf: cleanup KSF vs KSCF variables
    
    KSF is for setup strings, KSCF is for connection strings.
    
    But many of these were in the wrong category (like KSF_IKE)