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

[Antony Antony]

New commits:
commit 3dc146f463553fdaa400de3b83c4f897d601f7ce
Merge: 4b8afb1 17a07e8
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 22 12:45:30 2014 -0500

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

commit 4b8afb1aaa041b78566e413c76fee380bc11150d
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 22 12:44:29 2014 -0500

    x509: replace non exisiting function name from debug line with __func__