Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Fri, 17 Oct 2014 09:47:46 +0000 (11:47 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Fri, 17 Oct 2014 09:47:46 +0000 (11:47 +0200)

Trivial merge