Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Mon, 16 Dec 2013 22:59:57 +0000 (23:59 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 16 Dec 2013 22:59:57 +0000 (23:59 +0100)

Trivial merge