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

[Paul Wouters]

New commits:
commit 6dc734193954e743f3051db65b6b2e6ccc1c9474
Merge: bf4f3fb 1119d64
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Aug 22 20:04:11 2015 -0400

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

commit bf4f3fb3ecfbfcb7e26c76d5890d988d4cb376b9
Merge: 5fc16e3 0c9b40c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Aug 19 11:41:18 2015 -0400

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

commit 5fc16e330214015d07ec0da103f00afd7c45ea23
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Aug 19 11:39:06 2015 -0400

    testing: change ping + sleep + killall to use ping -w 2

commit cdd8199b7f6bcf64d7428351802179a611b2eb32
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Aug 11 11:19:22 2015 -0400

    packaging: set version to 3.14 for tag