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

[Paul Wouters]

New commits:
commit eab19fa5a5888e294f110138f8c2f50c638cacd3
Merge: 4d00853 01a73a7
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jul 17 14:53:45 2013 -0400

    Merge branch 'master' into matt-testing

commit 4d0085311654145b61ba36d3893b9f971a0b36ce
Merge: 405aae7 3bf51a4
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 25 22:13:15 2013 -0400

    Merge branch 'master' into matt-testing

commit 405aae71cd0ba352f0e0219cbf15d531665934f8
Merge: fd7b00b 90d799a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 25 22:11:31 2013 -0400

    Merge branch 'master' into matt-testing

commit fd7b00b09f1ab1f13d1aaf3e28065500b8271552
Merge: 9b7aa05 cb93cf2
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Jun 25 22:09:53 2013 -0400

    Merge branch 'master' into matt-testing

commit 9b7aa057533bc8613ba38156819ef8e65d79343f
Merge: cbc30f8 d286b2d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Jun 21 14:16:18 2013 -0400

    Merge branch 'master' into matt-testing

commit cbc30f8d279a8ad9236b16a286f518155d809364
Merge: 69f465b ed726b8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Jun 21 09:19:15 2013 -0400

    Merge branch 'master' into matt-testing

commit 69f465b1d0d2f5f97a131d7f5243c8d4b21cbf2c
Merge: 678dda1 7889a36
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 20 19:19:42 2013 -0400

    Merge branch 'master' into matt-testing

commit 678dda194b4b3b61171f19181970ed9bea6917de
Merge: fd34201 20fff02
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jun 20 19:03:00 2013 -0400

    Merge branch 'master' into matt-testing

commit fd3420113f0d5fd3b231abb3bae437486decac5d
Author: Matt Rogers <mrogers at redhat.com>
Date:   Thu Jun 20 01:59:36 2013 -0400

    testing: initiator/responder whack --deletestate tests

commit ef897b573c249cf3e18482561c43c0dd0ce10cde
Author: Matt Rogers <mrogers at redhat.com>
Date:   Thu Jun 20 01:09:47 2013 -0400

    testing - allow a "post" script to run after both I/R run scripts
    complete, just before running final on both. Good for testing
    whack after tunnel establishment.
    
    They are used by placing commands in eastpost1.sh/westpost2.sh or
    westpost1.sh/eastpost2.sh. The script with '1' will run before '2'
    for order control.

commit f2cb42f13a8a690db382e9c76ef14c25a8076d7b
Author: Matt Rogers <mrogers at redhat.com>
Date:   Thu Jun 20 01:03:35 2013 -0400

    fix dist_cert special keys/certs and paths