Merge branch 'stable-3.2' into stable-3.3

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

Change-Id: If15df802e23a6e2cc777aa5c4e835046783eace0
diff --git a/.mailmap b/.mailmap
deleted file mode 100644
index 84de0f3..0000000
--- a/.mailmap
+++ /dev/null
@@ -1 +0,0 @@
-Hector Oswaldo Caballero <hector.caballero@ericsson.com>