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

[Paul Wouters]

New commits:
commit b7858c47041b638f32f58a1d4622e201bce1c40d
Merge: 5aa6ff7 af22ff9
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Mar 10 10:51:45 2014 -0400

    Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan
    
    Conflicts:
    	testing/baseconfigs/all/etc/ipsec.d/ipsec.conf.common

commit 5aa6ff7174318b9ab273ece56b0fcb2817a5ff95
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Mar 10 10:50:32 2014 -0400

    testing: typo in comment