From 62941b7937fb55f98b3684c1d8a84882c7229c3c Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Fri, 18 Apr 2014 11:00:15 +0100
Subject: [PATCH] Fixup .mailmap file

Fix a few issues with the `.mailmap` file.

(cherry picked from commit 3a5de00c)
---
 .mailmap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index d964e53340..c0ca085f71 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,7 +6,8 @@ Juergen Hoeller <jhoeller@vmware.com> jhoeller <jhoeller@vmware.com>
 <apoutsma@gopivotal.com> <apoutsma@vmware.com>
 <apoutsma@gopivotal.com> <poutsma@mac.com>
 <ogierke@gopivotal.com> <ogierke@vmware.com>
-<aclement@gopivotal.com> <david_syer@hotmail.com>
+<dsyer@gopivotal.com> <david_syer@hotmail.com>
+<dsyer@gopivotal.com> <dsyer@vmware.com>
 <aclement@gopivotal.com> <andrew.clement@gmail.com>
 <aclement@gopivotal.com> <aclement@vmware.com>
 <dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>