Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Zauner <azet@azet.org>
Mon, 9 Dec 2013 21:04:29 +0000 (22:04 +0100)
committerAaron Zauner <azet@azet.org>
Mon, 9 Dec 2013 21:04:29 +0000 (22:04 +0100)

Trivial merge