Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Wed, 20 Nov 2013 16:20:47 +0000 (17:20 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Wed, 20 Nov 2013 16:20:47 +0000 (17:20 +0100)
commit4e7b3fa42eabef05f4e1a7647e1fc1d1698a4d64
treec8b1db6ab1dc9416f1684e817ac88a91400f7a4f
parent40040d27aa6126db84d32a02cc7fc1f0da7deeb8
parent73abc462de0f52307c4e568ff1c38f3bc1c81ac3
Merge branch 'master' of https://git.bettercrypto.org/ach-master
Resolved a conflict
Conflicts:
src/practical_settings.tex
src/cipher_suites.tex
src/practical_settings.tex