Commit ffa2e4a0 authored by Daniel Salzman's avatar Daniel Salzman

Merge branch 'key_log_evo' into 'master'

Key logging evolution

See merge request !852
parents 00e6b17e 663dd17d