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

[Paul Wouters]

New commits:
commit f949e39765c4586f8e42409bddc920d2dfb75039
Merge: 7fbf643 70b14ad
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Oct 12 14:33:21 2013 -0400

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

commit 7fbf643a55854cf4d340cab606d735efaf7e5245
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Oct 12 14:32:41 2013 -0400

    updown.netkey: don't rewrite resolv.conf when no DNS received