Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Tue, 7 Jan 2014 12:28:24 +0000 (13:28 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Tue, 7 Jan 2014 12:28:24 +0000 (13:28 +0100)
merge of a conflict. @Azet: please always - when pulling in change requests from github.com - also sync these against the main repo.
(git push origin master)

Thanks :)

Conflicts:
src/practical_settings/ssh.tex


Trivial merge