Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorcm <cm@coretec.at>
Mon, 9 Dec 2013 22:07:26 +0000 (23:07 +0100)
committercm <cm@coretec.at>
Mon, 9 Dec 2013 22:07:26 +0000 (23:07 +0100)

Trivial merge