Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorPepi Zawodsky <git@maclemon.at>
Tue, 24 Dec 2013 00:31:11 +0000 (01:31 +0100)
committerPepi Zawodsky <git@maclemon.at>
Tue, 24 Dec 2013 00:31:11 +0000 (01:31 +0100)

Trivial merge