Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Fri, 22 Nov 2013 11:05:59 +0000 (12:05 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Fri, 22 Nov 2013 11:05:59 +0000 (12:05 +0100)

Trivial merge