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

[Paul Wouters]

New commits:
commit 4ba8c47c643a74667b302bc48c544fc564e263e1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Jan 24 20:15:36 2016 -0500

    pluto: xauth: silence a few false warnings

commit 868ac9b4014a48061121d0a5da5c7d9817e0d1f8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Jan 24 20:14:07 2016 -0500

    building: minor changes in AES/DES defines
    
    This allows us to not include klips-crypto/des.h (and not include
    some klips-crypto/aes.h)
    
    The des.h file is tained by Eric Young licensing condition.