Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Fri, 22 Nov 2013 18:56:22 +0000 (19:56 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Fri, 22 Nov 2013 18:56:22 +0000 (19:56 +0100)
1  2 
src/practical_settings.tex

Simple merge