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

[Paul Wouters]

New commits:
commit 1156d1abf4fea2799111301f4ff70a0f163ec639
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 20 17:23:49 2016 -0400

    pluto: add --expire-bare-shunt <interval> for testing purposes