commit 4ab4ed97da995248341c16ebf8c33f09f3aea3c9
author Petr Michalec <epcim@apealive.net> Mon Sep 18 17:28:19 2017 +0200
committer GitHub <noreply@github.com> Mon Sep 18 17:28:19 2017 +0200
tree f24b84495c457fabe4cfe92c57334a770baa3b3f
parent ad441173490804d83cf6e7c917f1e5300470e3c4
parent 5a35e875a066f86ead66b031f4c0f08c916151f9

Merge branch 'sf-merge-test' into updates-for-andrew

README.rst

diff --git a/README.rst b/README.rst
index f606cdb..99de5f6 100644
--- a/README.rst
+++ b/README.rst
@@ -16,7 +16,7 @@
 * Ignore class notfound/regexp option
 
 
-.. include:: ../../README.extensions.rst
+.. include:: ./README-extensions.rst
 
 
 Documentation

reclass/version.py

diff --git a/reclass/version.py b/reclass/version.py
index 172e2d9..90c2cb7 100644
--- a/reclass/version.py
+++ b/reclass/version.py
@@ -10,9 +10,9 @@
 DESCRIPTION = 'merge data by recursive descent down an ancestry hierarchy (forked extended version)'
 VERSION = '1.5.2'
 AUTHOR = 'martin f. krafft / Andrew Pickford / salt-formulas community'
-AUTHOR_EMAIL = 'andrewp@nikhef.nl'
-MAINTAINER = 'Andrew Pickford'
-MAINTAINER_EMAIL = 'andrewp@nikhef.nl'
+AUTHOR_EMAIL = 'salt-formulas@freelists.org'
+MAINTAINER = 'salt-formulas community'
+MAINTAINER_EMAIL = 'salt-formulas@freelists.org'
 COPYRIGHT = 'Copyright © 2007–14 martin f. krafft, extensions © 2017 Andrew Pickford, extensions © salt-formulas community'
 LICENCE = 'Artistic Licence 2.0'
-URL = 'https://github.com/AndrewPickford/reclass'
+URL = 'https://github.com/salt-formulas/reclass'