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

[Antony Antony]

New commits:
commit b0a1511b02cb50af1a9e763a09cb6c830cddb8f6
Merge: ec09a90 3414a2d
Author: Antony Antony <antony at phenome.org>
Date:   Fri Jan 25 14:57:11 2013 +0100

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

commit ec09a90c83b2ded0d7cd757699dd93edad0461f3
Merge: 7dd8452 3930ef1
Author: Antony Antony <antony at phenome.org>
Date:   Thu Jan 17 21:13:56 2013 +0100

    Merge branch 'master' into audit
    
    Conflicts:
    	testing/pluto/ikev2-11-simple-psk/eastinit.sh
    	testing/pluto/ikev2-11-simple-psk/westinit.sh