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

Trivial merge