Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Mon, 20 Oct 2014 21:12:23 +0000 (23:12 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 20 Oct 2014 21:12:23 +0000 (23:12 +0200)

Trivial merge