Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Sat, 23 Nov 2013 15:44:57 +0000 (16:44 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Sat, 23 Nov 2013 15:44:57 +0000 (16:44 +0100)
1  2 
src/practical_settings.tex

Simple merge