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

Trivial merge