Merge remote-tracking branch 'origin/master' into issue-104-cannot-exec-setuids

Conflicts:
	doc/history.rst

1 files changed, 11 insertions, 1 deletions

diff --git a/doc/history.rst b/doc/history.rst
index 19c2973..c9d5640 100644
--- a/doc/history.rst
+++ b/doc/history.rst
@@ -4,12 +4,22 @@ History
 Releases
 --------
 
+Version 4.0
+```````````
+
+* Integration with :mod:`asyncio`: passing ``async=True`` to :meth:`~.expect`,
+  :meth:`~.expect_exact` or :meth:`~.expect_list` will make them return a
+  coroutine. You can get the result using ``yield from``, or wrap it in an
+  :class:`asyncio.Task`. This allows the event loop to do other things while
+  waiting for output that matches a pattern.
+
 Version 3.4
 ```````````
 * Fix regression that prevented executable, but unreadable files from
   being found when not specified by absolute path -- such as
   /usr/bin/sudo (:ghissue:`104`).
-
+* Fixed regression when executing pexpect with some prior releases of
+  the multiprocessing module where stdin has been closed (:ghissue:`86`).
 
 Version 3.3
 ```````````