Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorcm <cm@coretec.at>
Tue, 24 Dec 2013 16:31:54 +0000 (17:31 +0100)
committercm <cm@coretec.at>
Tue, 24 Dec 2013 16:31:54 +0000 (17:31 +0100)

Trivial merge