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

[Paul Wouters]

New commits:
commit f7d236877ce38aa825c57bde29f88b8132767437
Merge: 8b4496e 82b4210
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 8 01:03:36 2013 -0400

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

commit 8b4496e41767aee87bad94493598690106183454
Merge: d26a752 03fb343
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 1 18:03:23 2013 -0400

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

commit d26a75238c8a92ed0a29820469ca6b5d156f2cd2
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 1 13:44:27 2013 -0400

    updated changes

commit f64637c9f68ed5a65102bd12d12ce3da16da3c8d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 1 13:42:11 2013 -0400

    update auto= man page

commit c262ada6dd1902b804ada46ffddd3867099fa2a6
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 1 13:40:00 2013 -0400

    Rename auto=route to auto=ondemand
    
    For backwards compatibility, we still accept auto=route

commit f3626fae2a5baf7294c3db08ef957a003ab6aeaa
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 1 13:36:40 2013 -0400

    Remove obsoleted contrib/_updown version in C