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

[Paul Wouters]

New commits:
commit f209fd6e6c5dae60d4547c60bd926522d2fdf471
Merge: 87fee87 5c1e0cc
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Dec 8 02:17:43 2013 -0500

    Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan
    
    Conflicts:
    	lib/libswan/alg_info.c

commit 87fee87b5a22e2d964ae57d333cd008c5475d06d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Dec 8 02:16:06 2013 -0500

    removal of warningsarefatal for libipsecconf

commit f88eebcc43351f0a30cbe74c98e4e6ab60cb1b1a
Merge: 0459ae0 4602a82
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Dec 8 01:01:10 2013 -0500

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

commit 0459ae054c6e81695e51b4ab6ef4c8383b85f46f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Dec 8 01:00:54 2013 -0500

    testing: various test updates and some renames

commit f747de80b86e96d9db402a5da683ad32aabb3705
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Dec 8 00:59:28 2013 -0500

    testing: update ikev2-08-delete-notify

commit 79c2e3f0d1a4b96d9db19044e2b16efad3288770
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Dec 8 00:08:57 2013 -0500

    testing: fixup raw rsa keys for ikev2-09-rw-rsa

commit d5275e2b3b9eee43687382bc07fcf14307617666
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Dec 7 20:19:22 2013 -0500

    testing: Added netkey-pluto-06 which tests esp=null-md5

commit 10c21f9831d9d94122400c2fbfc71dd64beaa99d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Dec 7 18:18:48 2013 -0500

    testing: fixup basic-pluto-09