Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening
authorsebix <szebi@gmx.at>
Fri, 17 Jan 2014 11:02:48 +0000 (12:02 +0100)
committersebix <szebi@gmx.at>
Fri, 17 Jan 2014 11:02:48 +0000 (12:02 +0100)
commit75d47e5130206258a3f9cf73a705762780d75b43
treeb46554ec822fa995794a5e0665a7d8ac414a893b
parentdcf41228d9b46733eb798ff33f59f71a4cd78887
parent09cbe648ac2f068912aa3311d90aa357b6eb64e4
Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening
and adjust the LaTeX code

Conflicts:
src/practical_settings/mailserver.tex
src/practical_settings/vpn.tex
src/practical_settings/mailserver.tex
src/practical_settings/vpn.tex