Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Fri, 14 Feb 2014 13:45:59 +0000 (14:45 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Fri, 14 Feb 2014 13:45:59 +0000 (14:45 +0100)

Trivial merge