Merge branch 'krono/draft-enhanchement' of https://github.com/krono/Applied-Crypto...
authorAaron Kaplan <aaron@lo-res.org>
Tue, 7 Jan 2014 18:54:46 +0000 (19:54 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Tue, 7 Jan 2014 18:54:46 +0000 (19:54 +0100)

Trivial merge