From ab4c9735dea36d1c9aa3399723e4055b862452fe Mon Sep 17 00:00:00 2001
From: Peter Waller <peter@scraperwiki.com>
Date: Wed, 30 Jul 2014 14:13:43 +0100
Subject: [PATCH] Change Peter Waller's canonical e-mail address

Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: d687c5b3393a22e0db6473f0572a332f211c7102
Component: engine
---
 components/engine/.mailmap | 1 +
 components/engine/AUTHORS  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/engine/.mailmap b/components/engine/.mailmap
index bd6360a2af..7919eed502 100644
--- a/components/engine/.mailmap
+++ b/components/engine/.mailmap
@@ -93,3 +93,4 @@ Nathan LeClaire <nathan.leclaire@docker.com> <nathanleclaire@gmail.com>
 <marc@marc-abramowitz.com> <msabramo@gmail.com>
 Matthew Heon <mheon@redhat.com> <mheon@mheonlaptop.redhat.com>
 <bernat@luffy.cx> <vincent@bernat.im>
+<p@pwaller.net> <peter@scraperwiki.com>
diff --git a/components/engine/AUTHORS b/components/engine/AUTHORS
index c17120cec5..6f88355e18 100644
--- a/components/engine/AUTHORS
+++ b/components/engine/AUTHORS
@@ -421,7 +421,7 @@ Paul Nasrat <pnasrat@gmail.com>
 Paul <paul9869@gmail.com>
 Paul Weaver <pauweave@cisco.com>
 Peter Braden <peterbraden@peterbraden.co.uk>
-Peter Waller <peter@scraperwiki.com>
+Peter Waller <p@pwaller.net>
 Phillip Alexander <git@phillipalexander.io>
 Phil Spitler <pspitler@gmail.com>
 Phil <underscorephil@gmail.com>