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

[Paul Wouters]

New commits:
commit be931168203534eac15423848ab9a4d2d44b046b
Merge: b919592 63fdefa
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 16 15:20:56 2014 -0400

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

commit b919592f2a36a93c5776153a32534df1ad32c8da
Merge: 1454a09 ebd8ef5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri May 16 15:20:39 2014 -0400

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

commit 1454a0922e64f0328afa54f35793ccb18759cb72
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed May 14 15:08:26 2014 -0400

    pluto: rename out_sa() to ikev1_out_sa()

commit c1dee98d62f89360b7f61673bbaca07aa9e084ac
Merge: 4169484 f1e7c69
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed May 14 14:00:18 2014 -0400

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

commit 4169484271ffd24b0107f2a91fbf887ed9438dcf
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu May 8 14:45:49 2014 -0400

    Changed optiona name ikev1-natt to nat-ikev1-method