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

[Antony Antony]

New commits:
commit fde45071efbcbb6664119e7d42a8e193cc5af4ee
Author: Antony Antony <antony at phenome.org>
Date:   Sat Jun 7 00:39:25 2014 +0200

    pluto: make timer.c code IKE version independant with IS_IKE_SA()
    
    The timer code checked for IKEv1 phase1 and phase1.5, and assumed
    everything else was an ipsec sa. This included IKEv2 Parent SA's.
    
    the new macro IS_IKE_SA() returns true for either a v1 or v2 ISAKMP SA