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

Trivial merge