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

[Paul Wouters]

New commits:
commit d3094b800ec8a11847c7ca62e539230822b3e4e3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Mar 15 21:02:01 2015 -0400

    ipsec_doi.h: Fix warning on use of xfrm_user_sec_ctx_ike in prototype

commit d76902494ae5beddc4c9dd3a805d1e3c21d93d8a
Merge: 6e074f9 319172b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Mar 15 20:51:21 2015 -0400

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

commit 6e074f939ee723b3b7c5f90ef0d790e3f4498bff
Merge: 447fd6d 3c0a6f5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Mar 14 17:48:55 2015 -0400

    Merge branch 'nss-rewrite-final'
    
    Conflicts:
    	lib/libswan/Makefile
    	mk/program.mk
    	programs/pluto/Makefile

commit 3c0a6f59b1099a539254cf0301d1d0eb4317bef0
Author: Matt Rogers <mrogers at redhat.com>
Date:   Mon Mar 2 11:19:10 2015 -0500

    Rewrite of pluto's x509 code using the NSS cert library, including OCSP support
    See https://libreswan.org/wiki/OCSP