From: W. Trevor King <wking@tremily.us>
Date: Wed, 18 Apr 2012 17:11:32 +0000 (-0400)
Subject: Change my email address from drexel.edu to tremily.us.
X-Git-Tag: 0.8~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=524f08cec2375b9b35c4d7b1be996ffe18af87e9;p=calibcant.git

Change my email address from drexel.edu to tremily.us.
---

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..4a905eb
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+W. Trevor King <wking@tremily.us> <wking@drexel.edu>
diff --git a/README b/README
index 93d8d64..73dd49c 100644
--- a/README
+++ b/README
@@ -88,8 +88,8 @@ Author
 ======
 
 W. Trevor King
-wking@drexel.edu
-Copyright 2007-2011
+wking@tremily.us
+Copyright 2007-2012
 
 
 .. _layman: http://layman.sourceforge.net/
diff --git a/setup.py b/setup.py
index 56ba0e9..d32523b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,5 @@
+# Copyright
+
 "calibcant: tools for thermally calibrating AFM cantilevers"
 
 package_name = 'calibcant'
@@ -36,7 +38,7 @@ scripts = [os.path.join('bin', f) for f in sorted(os.listdir('bin'))]
 setup(name=package_name,
       version=__version__,
       maintainer='W. Trevor King',
-      maintainer_email='wking@drexel.edu',
+      maintainer_email='wking@tremily.us',
       url='http://blog.tremily.us/posts/%s/' % package_name,
       download_url='http://git.tremily.us/?p=calibcant.git;a=snapshot;h={};sf=tgz'.format(__version__),
       license='GNU General Public License (GPL)',