Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorEva Seidl <eva@booksinthefridge.at>
Tue, 24 Dec 2013 16:15:15 +0000 (17:15 +0100)
committerEva Seidl <eva@booksinthefridge.at>
Tue, 24 Dec 2013 16:15:15 +0000 (17:15 +0100)

Trivial merge