Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Wed, 20 Nov 2013 14:13:11 +0000 (15:13 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Wed, 20 Nov 2013 14:13:11 +0000 (15:13 +0100)

Trivial merge