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

[D. Hugh Redelmeier]

New commits:
commit 40cb64b53ea8db26e8750a96dee7f74d0518eaf2
Merge: 4684336 22c50a8
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Feb 15 17:31:45 2015 -0500

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

commit 4684336fe3fcaf49015faa8cfc04ff43173b65d9
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Feb 14 15:11:21 2015 -0500

    includes: make empty then-clause look intentional