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

Trivial merge