Merge with master

jaraco · jaraco · commit 5795660757f3 · 2015-08-23T09:06:36.000-04:00
diff --git a/.hgtags b/.hgtags
@@ -27,3 +27,4 @@ b96177b0522706277881ddc3f1fce41077eb9993 7.4
 76fab4bb56d10e83f2af64ce7a7e39d56e88eb70 7.5
 a96c4d592397e79e2fa16b632fcc89b48ed63d04 7.6
 06d6fdfddc0a69a56d4b378816d7e5b59ae4a018 7.6.1
+cf0bb158f8d370f5195b95c917201f51aa53c0a9 7.6.2
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,22 +1,4 @@
-7.6.1
------
-
-- #101: Supress error when `path.py` is not present as a distribution.
-
-7.6
----
-
-- Pull Request #100: Add ``merge_tree`` method for merging
-  two existing directory trees.
-- Uses `setuptools_scm <https://github.org/pypa/setuptools_scm>`_
-  for version management.
-
-7.5
----
-
-- #97: ``__rdiv__`` and ``__rtruediv__`` are now defined.
-
-7.5
+7.7
 ---
 
 - #88: Added support for resolving certain directories on a
@@ -45,6 +27,28 @@
   results. This functionality is experimental and may change.
   Feedback is invited.
 
+7.6.2
+-----
+
+- Re-release of 7.6.1 without unintended feature.
+
+7.6.1
+-----
+
+- #101: Supress error when `path.py` is not present as a distribution.
+
+7.6
+---
+
+- Pull Request #100: Add ``merge_tree`` method for merging
+  two existing directory trees.
+- Uses `setuptools_scm <https://github.org/pypa/setuptools_scm>`_
+  for version management.
+
+7.5
+---
+
+- #97: ``__rdiv__`` and ``__rtruediv__`` are now defined.
 
 7.4
 ---
