Merge branch 'zcrypt' into features

Add the zcrypt base patches into features using a tip branch for
parallel merging via multiple tress.
This commit is contained in:
Martin Schwidefsky 2018-06-25 10:25:09 +02:00
commit c879f71c74
8 changed files with 283 additions and 304 deletions