Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorDavid Durvaux <info@autopsit.org>
Thu, 14 Nov 2013 17:20:53 +0000 (18:20 +0100)
committerDavid Durvaux <info@autopsit.org>
Thu, 14 Nov 2013 17:20:53 +0000 (18:20 +0100)
1  2 
src/practical_settings.tex

Simple merge