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

[Antony Antony]

New commits:
commit 0c67f0b739940d9862c9988520f5f1bf2b766d33
Author: Antony Antony <antony at phenome.org>
Date:   Thu Jun 12 09:12:10 2014 +0200

    --tidy up scheduling EVENT_SA_EXPIRE

commit cb6b2c1af6c6ac4cbe3937e4b1422a9333db42d7
Author: Antony Antony <antony at phenome.org>
Date:   Thu Jun 12 09:08:38 2014 +0200

    --remove leftover comment

commit a60be63e5858c70e1b4bb9edefc243c4c9c97ea0
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Jun 12 03:05:46 2014 -0400

    more random tidying of v2 code

commit a7eacfefdb45c9d8eaff5adf67e5b4861d94f684
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Jun 11 20:20:05 2014 -0400

    tidy EVENT_SA_REPLACE setting in v2

commit f2c16efed7d5527bb94ef8cc71bbc7903982d52a
Author: Antony Antony <antony at phenome.org>
Date:   Thu Jun 12 00:25:07 2014 +0200

    ikev2: before scheduling EVENT_SA_REPLACE also take into account the margin