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)

Trivial merge