tree 438d9ea698487c483483c05314d13821e6f5d56f
parent 6a3fdd9b7fd3fd3846de85ec07b7c8fa5200a265
parent 67b6ac426dbe13cc13be2f9703d843b166a931f0
author Marco Miller <marco.miller@ericsson.com> 1606429290 -0500
committer Marco Miller <marco.miller@ericsson.com> 1606429290 -0500

Merge branch 'stable-3.3' into master

* stable-3.3:
  Remove no longer applicable .mailmap file contents

Change-Id: Id1ad81d9baf076e3e306df0beb0c3b29c9b31177