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

[Antony Antony]

New commits:
commit 7466e68d8545d5a547e08366f6ea4d67efad06bb
Merge: 1c6a38f 695af25
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 29 16:15:48 2014 +0200

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

commit 1c6a38f21f2279d5df6fd6324f3321050b2f2b3d
Merge: 3f39cea 4249b1a
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 29 07:35:44 2014 +0200

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

commit 3f39ceacfc67d89343e49dc1e52841d55247d0e2
Author: Antony Antony <antony at phenome.org>
Date:   Wed Oct 29 06:36:35 2014 +0200

    testing: ikev2-29-no-rekey and update ikev2-dpd-02  missing files