From cc6d219159e21ee88bf8a7d3087ca0604562bb35 Mon Sep 17 00:00:00 2001
From: John Dickinson <me@not.mn>
Date: Mon, 26 Mar 2012 05:14:01 -0500
Subject: [PATCH] added Ye Jia Xu to AUTHORS file and appropriate .mailmap
 entry

Change-Id: Ib05f7742c51d00bd5ba901973343fd68ed6cd114
---
 .mailmap | 1 +
 AUTHORS  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 7de8daa89d..f2aa13e934 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,3 +25,4 @@ Russ Nelson <russ@crynwr.com> <nelson@nelson-laptop>
 Marcelo Martins <btorch@gmail.com> <marcelo.martins@rackspace.com>
 Andrew Clay Shafer <acs@parvuscaptus.com> <andrew@cloudscaling.com>
 Soren Hansen <soren@linux2go.dk> <soren.hansen@rackspace.com>
+Ye Jia Xu <xyj.asmy@gmail.com> monsterxx03 <xyj.asmy@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index be0783a2cc..ea34009cb1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -65,4 +65,5 @@ Chris Wedgwood (cw@f00f.org)
 Conrad Weidenkeller (conrad.weidenkeller@rackspace.com)
 Doug Weimer (dweimer@gmail.com)
 Cory Wright (cory.wright@rackspace.com)
+Ye Jia Xu (xyj.asmy@gmail.com)
 Pete Zaitcev (zaitcev@kotori.zaitcev.us)