tree e5ebcd487dbcff26f9060bd0f836b75facf0e346
parent 162ddd1d6b32a82e060eaca8f8d32683c49560ac
parent 93770e2c6baf86f9f5d5396ac78355363972da17
author lombardofr <lombardo@everyup.it> 1567188948 +0200
committer lombardofr <lombardo@everyup.it> 1567188960 +0200

Merge branch 'master' into v6.0

Change-Id: Ided79529f4125d7de9637f62beceb9eb99749e35
Signed-off-by: lombardofr <lombardo@everyup.it>