Merge branch 'zcrypt' into features
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 25 Jun 2018 08:25:09 +0000 (10:25 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 25 Jun 2018 08:25:09 +0000 (10:25 +0200)
commitc879f71c746c655ae03e1b828296c461b77ac8b6
treea289b7aadeba62776491188bcc62fe13862ff47d
parent514211f542dd6eb877adf46d400ce351c81d95ad
parentf1b0a4343c4184bef9fdea8fad41f09bbd3d63ec
Merge branch 'zcrypt' into features

Add the zcrypt base patches into features using a tip branch for
parallel merging via multiple tress.