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

[Paul Wouters]

New commits:
commit 9aa40f145b87f82645035404ced42fcbec1346c3
Merge: c0ea9ac c019c68
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 8 16:48:19 2015 -0400

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan

commit c0ea9ac412e68a998b14a50460c0ace010438e11
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 8 15:16:58 2015 -0400

    updated changes from stash