Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Mon, 20 Jan 2014 22:21:23 +0000 (23:21 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 20 Jan 2014 22:21:23 +0000 (23:21 +0100)

Trivial merge