Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Thu, 14 Nov 2013 17:21:57 +0000 (18:21 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Thu, 14 Nov 2013 17:21:57 +0000 (18:21 +0100)

Trivial merge