Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorPepi Zawodsky <git@maclemon.at>
Fri, 6 Dec 2013 20:12:19 +0000 (21:12 +0100)
committerPepi Zawodsky <git@maclemon.at>
Fri, 6 Dec 2013 20:12:19 +0000 (21:12 +0100)

Trivial merge