Merge branch 'update-email'

paetzke · Aug 15, 2015 · 555ad9e · 555ad9e
2 parents 872882b + 7f31f8f
commit 555ad9e
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 15 deletions.
diff --git a/orgco/__init__.py b/orgco/__init__.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """

diff --git a/orgco/convert.py b/orgco/convert.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """

diff --git a/orgco/orgalyzer.py b/orgco/orgalyzer.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """

diff --git a/orgco/orgco.py b/orgco/orgco.py
@@ -3,7 +3,7 @@
 """
 orgco
 
-Copyright (c) 2013, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """

diff --git a/setup.py b/setup.py
@@ -2,20 +2,19 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
-from setuptools import setup, find_packages
-
+from setuptools import find_packages, setup
 
 setup(name='orgco',
       py_modules=['orgco'],
       description='With orgco you can convert Emacs\' orgmode to other formats.',
       long_description=(open('README.rst').read()),
       version='0.1.1',
       author='Friedrich Paetzke',
-      author_email='f.paetzke@gmail.com',
+      author_email='paetzke@fastmail.fm',
       license='BSD',
       url='https://github.com/paetzke/orgco',
       packages=find_packages(exclude=['tests*']),

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """

diff --git a/tests/test_find_markup.py b/tests/test_find_markup.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """

diff --git a/tests/test_html.py b/tests/test_html.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """

diff --git a/tests/test_orgdoc.py b/tests/test_orgdoc.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """

diff --git a/tests/test_rst.py b/tests/test_rst.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
@@ -37,7 +37,7 @@ def test_header01():
 
 
 def test_images00():
-        assertOrgAndRstEqual('images00.org', 'images00.rst')
+    assertOrgAndRstEqual('images00.org', 'images00.rst')
 
 
 def test_list00():

diff --git a/tests/test_shortcuts.py b/tests/test_shortcuts.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """