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

[Paul Wouters]

New commits:
commit a4c1a4bf859165a0ed842e36654ff0299f3d398f
Merge: 6adafaa a582877
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Aug 20 12:45:11 2014 -0400

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

commit 6adafaae3c53489a6ed59297c3ee974160a6bcfe
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Aug 19 19:21:21 2014 -0400

    testing: basic-pluto-06 fixup
    
    This tests non-root owned config files but required NSS keys.
    Changed to use PSK.

commit 49242326df1e25d253a961a75bf7a7c685b42a86
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Aug 19 19:13:38 2014 -0400

    testing: secctx_attr_value -> secctx-attr-value