Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Sat, 11 Jan 2014 19:03:57 +0000 (20:03 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Sat, 11 Jan 2014 19:03:57 +0000 (20:03 +0100)

Trivial merge