Permalink
Browse files

Merge branch '1.5'

  • Loading branch information...
bitprophet committed Dec 16, 2012
2 parents cf3b015 + a571241 commit 650a46d887d118c20491e81fac74b8ba1b57bd0c
Showing with 2 additions and 1 deletion.
  1. +2 −1 docs/changelog.rst
View
@@ -26,7 +26,8 @@ Changelog
=========
* :bug:`604` Fixed wrong treatment of backslashes in put operation when uploading
- directory tree on Windows. Thanks to @jaraco for the catch. Thanks to @dieresys
+ directory tree on Windows. Thanks to Jason Coombs for the catch and
+ `@diresys` & Oliver Janik for the patch.
for the patch.
* :bug:`792` The newish `~fabric.context_managers.shell_env` context manager
was incorrectly omitted from the ``fabric.api`` import endpoint. This has

0 comments on commit 650a46d

Please sign in to comment.