Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorDavid Durvaux <david@Davids-MacBook-Pro.local>
Thu, 12 Dec 2013 19:40:45 +0000 (20:40 +0100)
committerDavid Durvaux <david@Davids-MacBook-Pro.local>
Thu, 12 Dec 2013 19:40:45 +0000 (20:40 +0100)

Trivial merge