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

Trivial merge