Merge branch '1.11' into 1.12

Conflicts:
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-01-30 14:32:22 -08:00
commit 792cfe0cf6
1 changed files with 0 additions and 3 deletions

View File

@ -2,9 +2,6 @@
Changelog
=========
* :release:`1.12.2 <2014-01-21>`
* :release:`1.11.4 <2014-01-21>` 193
* :release:`1.10.6 <2014-01-21>` 193
* :bug:`193` (and its attentant PRs :issue:`230` & :issue:`253`): Fix SSH agent
problems present on Windows. Thanks to David Hobbs for initial report and to
Aarni Koskela & Olle Lundberg for the patches.