Merge pull request #2420 from chriskuehl/master

Replace n-dash in HISTORY to workaround pip bug
psf · Jan 23, 2015 · 2f7f6a5 · 2f7f6a5
2 parents d2d576b + 74d85d0
commit 2f7f6a5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -103,7 +103,7 @@ Release History
 - Support for connect timeouts! Timeout now accepts a tuple (connect, read) which is used to set individual connect and read timeouts.
 - Allow copying of PreparedRequests without headers/cookies.
 - Updated bundled urllib3 version.
-- Refactored settings loading from environment — new `Session.merge_environment_settings`.
+- Refactored settings loading from environment -- new `Session.merge_environment_settings`.
 - Handle socket errors in iter_content.