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

[Paul Wouters]

New commits:
commit cad091083a7ab89d055eb8cf9b32812b873813bf
Merge: 1d7b2d5 d8ea2bd
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 18 15:29:23 2013 -0400

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

commit 1d7b2d5891aec477acce6e9ed312add6ae84ddf2
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 18 15:15:20 2013 -0400

    updated changes

commit 2cacd43abfe4599092b2b8e87b1e289e583dd748
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 18 15:13:11 2013 -0400

    pluto: lsbz#82: Phase out DBG_KLIPS/DBG_NETKEY for DBG_KERNEL
    
    Also change pluto parameter --debug-kernel but allow --debug-klips
    and --debug-netkey as backwards compatible options.