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

[D. Hugh Redelmeier]

New commits:
commit 546d36a76ad23e8ee65084ee8108065f4d327809
Merge: 210c8e4 8f85e4c
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jan 19 14:13:43 2014 -0500

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

commit 210c8e434edf594bdd56b115a860471dbb101e02
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Jan 19 14:10:11 2014 -0500

    Tidy lib/libipsecconf/confread.c:
    - fix NULL defererence found by Coverity
    - convert ints that were really bools
    - reduce scope of some variables