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

[Paul Wouters]

New commits:
commit 3af4d76ff743523fc6d56958f8d33143f0b615c0
Merge: f54824c 37905fe
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 16 13:48:25 2014 -0400

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

commit f54824c9c5d4384e3be07e6ca54cae5d8e0388c4
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 10 23:25:06 2014 -0400

    testing: update basic-pluto-02 with new orienting output
    
    We no longer display the remote nexthop when we managed to orient,
    as we cannot know their nexthop (this will show up in more tests)