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)
commit60964fa1ac55d96e7feec28f578d0541f09bede9
tree11a5049a08ddd4edd01f99900f8fcac565271288
parent2b2d331799ac65326b2d577fec327e8df7dcd245
parent56e5b0ab13eb59e1ee739a24db085b3b9fc76a25
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