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

[Paul Wouters]

New commits:
commit 036b2a88c33a57c0967f5705806a954d3e1bbc9c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Nov 19 12:40:00 2015 +0900

    pluto: Change DPD_ACTION_uninitialized to DPD_ACTION_DISABLED and name it.
    
    This prevents ipsec status from displaying: dpd: (null) for type=passthrough
    connections. It now prints: dpd: action:disabled