Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Remove no longer applicable .mailmap file contents Change-Id: I63c006a6245bdc026ad54d8213b2d251c9708acf
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>