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

[Paul Wouters]

New commits:
commit 1c11f0f8f88a58644801d8877fbd4e63956a6cb7
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jun 24 14:30:19 2015 -0300

    testing: update status output for shuntlifetime and xfrmlifetime

commit d620350109db008c9483cb1ad89658d5bb322adc
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jun 24 14:29:32 2015 -0300

    fixup status output for shunt_lifetime=%lu -> shuntlifetime=%lus

commit 933470b55a1794de8a984a223001cb0f0d0707b8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jun 24 14:28:54 2015 -0300

    pluto/stackmanager: add supprot for xfrmlifetime=