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

Trivial merge