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

[Paul Wouters]

New commits:
commit 6eb2215df18b157316844e9556ba463955007981
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 23 20:05:43 2016 -0400

    Revert "pluto: allow overlap for netkey/xfrm stack"
    
    This reverts commit 35e66726b762cd101eba3c57bdd1f135d19cbda6.