Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorRalf Schlatterbeck <rsc@runtux.com>
Fri, 6 Dec 2013 17:18:57 +0000 (18:18 +0100)
committerRalf Schlatterbeck <rsc@runtux.com>
Fri, 6 Dec 2013 17:18:57 +0000 (18:18 +0100)

Trivial merge