Merge branch '1.3' into 1.4

Conflicts: docs/changelog.rst fabric/version.py
me-vlad · Apr 5, 2012 · ba53b6e · ba53b6e
2 parents 62ff8e1 + 5b50a16
commit ba53b6e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -25,6 +25,7 @@ would have also been included in the 1.2 line.
 Changelog
 =========
 
+* :release:`1.3.6 <2012-04-04>`
 * :bug:`608` Add ``capture`` kwarg to `~fabric.contrib.project.rsync_project`
   to aid in debugging rsync problems.
 * :bug:`607` Allow `~fabric.operations.local` to display stdout/stderr when it