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

[Andrew Cagney]

New commits:
commit 6d97a964193cc6cc5cc356bd55c64de0ea384f21
Merge: c40809e 093ec0e
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Oct 11 15:40:17 2016 -0400

    pluto: merge in moving aes-ccm to ike_alg_init().
    
    (this also illustrates how "git pull; git push" switches first-parent
    so that this trivial change is "first" and previous head second.)
    
    Merge branch 'master' of ...

commit c40809e9bc3b11e5782832b6410a91f7e728a852
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Oct 11 15:33:34 2016 -0400

    pluto: move aes_ccm to ike_alg_aes.[hc], add using ike_alg_init()