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

[Paul Wouters]

New commits:
commit 31cdb95e9d396fcd2da479eb2e4f0a007aa60dfa
Merge: f9d1458 03a36af
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Apr 17 12:23:19 2014 -0400

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

commit f9d1458ac6874e5a815259179c28398bba7fa598
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Apr 17 12:22:36 2014 -0400

    klips: fix spurious arguments in version printing SAref code

commit b1f2d9d31d6f16085f23c420e9192c3c0165db33
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Apr 17 11:18:45 2014 -0400

    klips: cryptoapi - use #if defined(), not #if