From: Neil Smith <neil.github@njae.me.uk>
Date: Mon, 25 Nov 2013 17:37:10 +0000 (+0000)
Subject: Merge branch 'master' into neil
X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=afc6b4e900c2215e205ea97d191dd5b78619d250;p=cipher-tools.git

Merge branch 'master' into neil
---

afc6b4e900c2215e205ea97d191dd5b78619d250