Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Zauner <azet@azet.org>
Wed, 11 Dec 2013 10:56:55 +0000 (11:56 +0100)
committerAaron Zauner <azet@azet.org>
Wed, 11 Dec 2013 10:56:55 +0000 (11:56 +0100)

Trivial merge