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

[Matt Rogers]

New commits:
commit 83936beead696be840e02217149e23f1bd4ef6fd
Merge: e9ac3c9 106d5d8
Author: Matt Rogers <mrogers at redhat.com>
Date:   Mon Mar 23 12:43:18 2015 -0400

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

commit e9ac3c9ab938374610fc88ec55064da5b5c525bd
Author: Matt Rogers <mrogers at redhat.com>
Date:   Mon Mar 23 12:41:06 2015 -0400

    ipsec: add sql: DB upgrade to --checknss
    
    Handles passworded (nsspassword token:pw format and plain) and non-passworded
    databases