Merge https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Sun, 11 May 2014 10:31:45 +0000 (12:31 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Sun, 11 May 2014 10:31:45 +0000 (12:31 +0200)
commitbf58f9603c0b9f67d6a286f394b00b1cb92340e3
treec9079eb2734fc142315689ac7c507b2e708344ea
parentbd292daa90cb4d2b5849a40f033e3b3ba3a6d4b5
parent07cc338a7021d7e6ceea5a4209d82da7e467808d
Merge https://git.bettercrypto.org/ach-master