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

[Paul Wouters]

New commits:
commit 776735918e0e99d2c7c0e9717668cb14b83ff775
Merge: 350bfa1 1b04341
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 23 13:50:12 2015 -0300

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
    
    Conflicts:
    	testing/pluto/newoe-04-01/east.console.txt
    	testing/pluto/newoe-04-01/road.console.txt

commit 350bfa1766e11cf2df701a70978d188328000e98
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 23 13:49:10 2015 -0300

    testing: minoew newoe updates