Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorWolfgang Breyha <wolfgang.breyha@univie.ac.at>
Tue, 19 Nov 2013 23:51:03 +0000 (00:51 +0100)
committerWolfgang Breyha <wolfgang.breyha@univie.ac.at>
Tue, 19 Nov 2013 23:51:03 +0000 (00:51 +0100)
1  2 
src/practical_settings.tex

Simple merge