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

[D. Hugh Redelmeier]

New commits:
commit 213722695f354722214582206257913b49a9eacf
Merge: ff3295f f58b43e
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Apr 5 03:28:03 2014 -0400

    Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan
    Paul and I chewed on the same code.
    Conflicts:
    	include/certs.h
    	lib/libswan/certload.c
    	programs/pluto/ikev2_x509.c
    	programs/pluto/x509.c

commit ff3295f953695d2baf83276060c1768c13f122c1
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Apr 5 03:19:46 2014 -0400

    Eliminate moribund *sendcert=forcedtype feature.
    
    - simplify use of certificate types
      (internally we only have CERT_NONE and CERT_X509_SIGNATURE)
    
    - renamed cert_t's "type" field to "ty" -- easier to egrep
    
    - various bits of tidying that falls out of this