Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Fri, 22 Nov 2013 21:53:53 +0000 (22:53 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Fri, 22 Nov 2013 21:53:53 +0000 (22:53 +0100)
commit2f04380bf93d327a70cc116e68e3792eee678558
tree72df67ce12624828118a2a2cc0575a318230c3cb
parent3170e1be743b56337355786442c3c98e322389af
parent97f20929b367fe702a32cc15ac16ee7a71002f0d
Merge branch 'master' of https://git.bettercrypto.org/ach-master
src/practical_settings.tex