Merge branch 'reauth-collision'
authorMartin Willi <martin@revosec.ch>
Thu, 17 Apr 2014 08:14:49 +0000 (10:14 +0200)
committerMartin Willi <martin@revosec.ch>
Thu, 17 Apr 2014 08:14:49 +0000 (10:14 +0200)
Fixes two collisions between IKE_SA re-authentication and CHILD_SA rekeying.


Trivial merge