Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorcm <cm@coretec.at>
Mon, 25 Nov 2013 19:43:59 +0000 (20:43 +0100)
committercm <cm@coretec.at>
Mon, 25 Nov 2013 19:43:59 +0000 (20:43 +0100)

Trivial merge