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

[D. Hugh Redelmeier]

New commits:
commit 6ef54ae4bcb29bf1aaab4f6c4f6386b113155b64
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun May 1 15:30:26 2016 -0400

    camellia.h: simplify preprocessor conditional