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

Simple merge