[8.1.2] Publish Pywikibot 8.1.2

Merge branch 'master' into stable

Change-Id: I931acc9f4ee1e1c7f4467e4787a47ed036c84cd1
---
M pywikibot/tools/__init__.py
M pywikibot/__metadata__.py
M scripts/__init__.py
4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py
index 39e02b3..ec3c535 100644
--- a/pywikibot/__metadata__.py
+++ b/pywikibot/__metadata__.py
@@ -11,11 +11,7 @@
 
 
 __name__ = 'pywikibot'
-<<<<<<< HEAD   (7da1f9 Merge branch 'master' into stable)
-__version__ = '8.1.1'
-=======
-__version__ = '8.2.0.dev1'
->>>>>>> BRANCH (1bc8b5 [doc] update ROADMAP.rst)
+__version__ = '8.1.2'
 __description__ = 'Python MediaWiki Bot Framework'
 __maintainer__ = 'The Pywikibot team'
 __maintainer_email__ = 'pywikibot@lists.wikimedia.org'
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index 717a6bd..25f2395 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -240,7 +240,7 @@
 
         This ensures that ``_cmpkey`` method is defined in subclass.
 
-        .. versionadded:: 8.2
+        .. versionadded:: 8.1.2
         """
 
     def __lt__(self, other):
diff --git a/scripts/__init__.py b/scripts/__init__.py
index 643e159..4be7d80 100644
--- a/scripts/__init__.py
+++ b/scripts/__init__.py
@@ -29,4 +29,4 @@
 #
 # Distributed under the terms of the MIT license.
 #
-__version__ = '8.2.0'
+__version__ = '8.1.0'

