Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorWolfgang Breyha <wolfgang.breyha@univie.ac.at>
Fri, 15 Nov 2013 19:54:44 +0000 (20:54 +0100)
committerWolfgang Breyha <wolfgang.breyha@univie.ac.at>
Fri, 15 Nov 2013 19:54:44 +0000 (20:54 +0100)

Trivial merge