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

Trivial merge