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

[Paul Wouters]

New commits:
commit aaca56dd807c52553e256733bb9ee083efb0de7e
Merge: 5dae612 db32c8a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Apr 27 18:29:32 2013 -0400

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

commit 5dae61236e9bb597046178834497bb2243cbac64
Merge: 32df6c4 97fc483
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Apr 24 12:22:37 2013 -0400

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

commit 32df6c4175a5f22e5c83f1478356d20776d9f64e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Apr 20 12:29:46 2013 -0400

    * remove commented out sha2_256-96 handling

commit 6a72cc8d13a6c7e926b9992836e8372aa5317e09
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Apr 20 12:18:46 2013 -0400

    * pluto: fix error message
    
    The error for ike=modp1536 said "esp error" instead of "ike error"