Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Zauner <azet@azet.org>
Mon, 16 Dec 2013 23:41:15 +0000 (00:41 +0100)
committerAaron Zauner <azet@azet.org>
Mon, 16 Dec 2013 23:41:15 +0000 (00:41 +0100)

Trivial merge