Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAdi Kriegisch <adi@kriegisch.at>
Mon, 9 Dec 2013 22:34:02 +0000 (23:34 +0100)
committerAdi Kriegisch <adi@kriegisch.at>
Mon, 9 Dec 2013 22:34:02 +0000 (23:34 +0100)

Trivial merge