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

[Antony Antony]

New commits:
commit 0881dff19b6e8b2ea2534f70bb934194c56c0027
Merge: 78c4e52 f63016d
Author: Antony Antony <antony at phenome.org>
Date:   Tue Apr 9 16:48:32 2013 +0000

    Merge branch 'addresspool' of ssh://vault.foobar.fi/srv/src/libreswan into addresspool
    
    Conflicts:
    	programs/pluto/addresspool.c
    	programs/pluto/addresspool.h

commit 78c4e524aa68db4b4c9126aea264dd21b3d9baf1
Author: Antony Antony <antony at phenome.org>
Date:   Tue Apr 9 16:45:25 2013 +0000

    * addresspool : code cleanup. removed unused bits

commit a1d7edfae641371025ebd1c5a5a127356a0aa2d0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Apr 9 12:32:10 2013 -0400

    * updated changes

commit b7e19e8dad109fb14c6826438ee8c3acfea2f07e
Merge: afd74c1 49793ba
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Apr 9 12:31:04 2013 -0400

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

commit afd74c1b4c430248b491a9296cc715b03c14d8dc
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Apr 9 12:30:45 2013 -0400

    * updated changes

commit 9c3130dbe56a12349fb672afcb934ed3fcc7b3f4
Author: Antony Antony <antony at phenome.org>
Date:   Tue Apr 9 12:28:15 2013 -0400

    * addresspool: Use same_id() to identify reconnecting client and re-use lease
    
    Signed-off-by: Paul Wouters <pwouters at redhat.com>

commit 49793baeb4659d6013346b67737627bcda584e68
Author: Antony Antony <antony at phenome.org>
Date:   Tue Apr 9 09:57:27 2013 +0000

    * testing : ikev2-05-basic-psk seems to need nhelpers=4 too. may be 2 is
     enough

commit a9d558f144f106a3b1f5069d4eab37e636c59f09
Author: Antony Antony <antony at phenome.org>
Date:   Tue Apr 9 09:51:40 2013 +0000

    * ikev2 nss : fix bug 78. may need 	nhelpers=4 or so too