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

[Paul Wouters]

New commits:
commit 2b2f2d2744325b50eb475c53f51095ec0f1ea9fa
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Nov 19 12:22:48 2015 +0900

    libipsecconf: Allow dpdtimeout= and dpddelay= to use time units.
    
    So we can use i.e. dpdtimeout=2m