Merge https://github.com/martin-rublik/Applied-Crypto-Hardening
authorAaron Zauner <azet@azet.org>
Fri, 6 Jun 2014 14:47:22 +0000 (16:47 +0200)
committerAaron Zauner <azet@azet.org>
Fri, 6 Jun 2014 14:47:22 +0000 (16:47 +0200)

Trivial merge