Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Zauner <azet@azet.org>
Mon, 23 Dec 2013 20:38:44 +0000 (21:38 +0100)
committerAaron Zauner <azet@azet.org>
Mon, 23 Dec 2013 20:38:44 +0000 (21:38 +0100)

Trivial merge