From: Aaron Kaplan <aaron@lo-res.org>
Date: Tue, 7 Jan 2014 12:28:24 +0000 (+0100)
Subject: Merge branch 'master' of https://git.bettercrypto.org/ach-master
X-Git-Url: https://git.bettercrypto.org/ach-master.git/commitdiff_plain/60964fa1ac55d96e7feec28f578d0541f09bede9

Merge branch 'master' of https://git.bettercrypto.org/ach-master

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
---

60964fa1ac55d96e7feec28f578d0541f09bede9