Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Tue, 24 Dec 2013 17:15:44 +0000 (18:15 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Tue, 24 Dec 2013 17:15:44 +0000 (18:15 +0100)

Trivial merge