Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Mon, 25 Nov 2013 20:36:37 +0000 (21:36 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 25 Nov 2013 20:36:37 +0000 (21:36 +0100)
1  2 
src/practical_settings.tex

Simple merge