Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorDavid Durvaux <david@autopsit.org>
Mon, 26 May 2014 15:17:32 +0000 (17:17 +0200)
committerDavid Durvaux <david@autopsit.org>
Mon, 26 May 2014 15:17:32 +0000 (17:17 +0200)

Trivial merge