Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Zauner <azet@azet.org>
Tue, 3 Jun 2014 16:37:04 +0000 (18:37 +0200)
committerAaron Zauner <azet@azet.org>
Tue, 3 Jun 2014 16:37:04 +0000 (18:37 +0200)

Trivial merge