Merge branch 'master' of github.com:sebix/Applied-Crypto-Hardening into sebix-master
authorAaron Kaplan <aaron@lo-res.org>
Mon, 20 Jan 2014 23:26:54 +0000 (00:26 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 20 Jan 2014 23:26:54 +0000 (00:26 +0100)

Trivial merge