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

[Paul Wouters]

New commits:
commit 6721f318a966c18423516d6e66e20605ccc8435c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 8 22:13:08 2016 -0400

    updated changes

commit fbd8d9485e2671e6df26723d0947744702deeb70
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun May 8 22:09:33 2016 -0400

    pluto: Add vti-interface= and vti-routing= options and man page entries
    
    - add options to parser
    - updown script now receives VTI_IFACE=iface an VTI_ROUTING=yes|no
    - add options to status output
    
    This commit does not include the actual handling of options in the
    _updown.netkey script.