Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorUlrich <ulrich.poeschl@bmlv.gv.at>
Wed, 20 Nov 2013 09:26:04 +0000 (10:26 +0100)
committerUlrich <ulrich.poeschl@bmlv.gv.at>
Wed, 20 Nov 2013 09:26:04 +0000 (10:26 +0100)

Trivial merge