Merge pull request #195 from nicoddemus/release-1.18.2

Prepare CHANGELOG for 1.18.2

CHANGELOG.rst

@@ -1,3 +1,18 @@
+pytest-xdist 1.18.2 (2017-07-28)
+================================
+
+Bug Fixes
+---------
+
+- Removal of unnecessary dependency on incorrect version of py. (`#105
+  <https://github.com/pytest-dev/pytest-xdist/issues/105>`_)
+
+- Fix bug in internal event-loop error handler in the master node. This bug
+  would shadow the original errors making extremely hard/impossible for users
+  to diagnose the problem properly. (`#175 <https://github.com/pytest-
+  dev/pytest-xdist/issues/175>`_)
+
+
 pytest-xdist 1.18.1 (2017-07-05)
 ================================
 

changelog/105.bugfix

@@ -1 +0,0 @@
-Removal of unnecessary dependency on incorrect version of py.

changelog/175.bugfix

@@ -1,2 +0,0 @@
-Fix error internal error handling during event loop in the master node. This bug would shadow the original errors
-making extremely hard/impossible for users to diagnose the problem properly.