Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Tue, 3 Jun 2014 19:38:30 +0000 (21:38 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Tue, 3 Jun 2014 19:38:30 +0000 (21:38 +0200)

Trivial merge