Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorThomas Schreck <tom@schreck-thomas.de>
Mon, 16 Dec 2013 21:14:18 +0000 (22:14 +0100)
committerThomas Schreck <tom@schreck-thomas.de>
Mon, 16 Dec 2013 21:14:18 +0000 (22:14 +0100)
commitb90358dd99230b575a828de2b604f7817d0abcf8
tree842d22cad883cc3a34fe842330c751c47b6e240f
parent7ef1dfa011943e493907d03f92fc6adeb57012fa
parentf69b6e616bcd021f80a5e4466bc74fa74fe60611
Merge branch 'master' of https://git.bettercrypto.org/ach-master

Conflicts:
src/PKIs.tex
src/PKIs.tex
src/applied-crypto-hardening.bib