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

[Philippe Vouters]

New commits:
commit a9037fbf620029f1989150985f54ff37454afe2b
Merge: 988551c 3660560
Author: Philippe Vouters <Philippe.Vouters at laposte.net>
Date:   Sun Jan 13 03:21:32 2013 +0100

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
    
    Conflicts:
    	lib/libipsecconf/parser.l
    	lib/libipsecconf/parser.y
    	programs/pluto/rcv_whack.c

commit 988551cded876cd20eb2733df82e92424baeaa47
Author: Philippe Vouters <Philippe.Vouters at laposte.net>
Date:   Sun Jan 13 03:14:59 2013 +0100

    Fixed up (not found) printf when addconn --verbose

commit 02a0d794787d6a526ca23436ffb644f6b18965f3
Author: Philippe Vouters <Philippe.Vouters at laposte.net>
Date:   Sun Jan 13 03:12:34 2013 +0100

    find_ifaces() call moved from rcv_whack.c to server.c - Reason : for my roadwarrior test to work

commit 8ce117a706cfa4b1cfc3884f583fc26fada3df22
Author: Philippe Vouters <Philippe.Vouters at laposte.net>
Date:   Sun Jan 13 03:08:35 2013 +0100

    Adding EOL when an EOF at EOL