Merge branch 'master' of github.com:dopefishh/ssh-pres
authorMart Lubbers <mart@martlubbers.net>
Tue, 8 Jul 2014 13:28:16 +0000 (15:28 +0200)
committerMart Lubbers <mart@martlubbers.net>
Tue, 8 Jul 2014 13:28:16 +0000 (15:28 +0200)
commite089f81414c5d661914480e8ec0de354b1b93b33
tree53478bec3a3766e32e0fa1c6e6578dc9afd3baec
parent7e423d983e70ec02872335ef9a596e87879a789c
parent045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
Merge branch 'master' of github.com:dopefishh/ssh-pres

Conflicts:
intro.tex
server.tex
intro.tex
server.tex
truuk.tex