Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorcm <cm@coretec.at>
Wed, 20 Nov 2013 16:29:39 +0000 (17:29 +0100)
committercm <cm@coretec.at>
Wed, 20 Nov 2013 16:29:39 +0000 (17:29 +0100)
1  2 
src/practical_settings.tex

Simple merge