Merge branch 'master' of github:BetterCrypto/Applied-Crypto-Hardening
authorPepi Zawodsky <git@maclemon.at>
Sun, 29 Mar 2015 19:47:55 +0000 (21:47 +0200)
committerPepi Zawodsky <git@maclemon.at>
Sun, 29 Mar 2015 19:47:55 +0000 (21:47 +0200)
1  2 
presentations/org-training/agenda.md

Simple merge