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

[Paul Wouters]

New commits:
commit 0e8a6a2e7e4fae0179cf44d82486a4de62afe9ba
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Mar 20 14:10:46 2016 -0400

    update changes

commit 3e437d5b0304e58832bf7113af279748ad105802
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Mar 20 14:09:45 2016 -0400

    pluto: Refuse to load conns with protoport=XX/%any on both sides