merge 0.17 branch into master

e5abacf3 · Stefan Behnel · 3991b94b · 3dd98cc7 · e5abacf3 · e5abacf3
Commit e5abacf3 authored Dec 14, 2012 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.hgtags .hgtags +1 -0

CHANGES.rst CHANGES.rst +1 -1

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -41,3 +41,4 @@ a6b9f0a6d02d23fc3d3a9d0587867faa3afb2fcd 0.14.rc0
 15bf34c9387444e262acb1de594405444dd571a4 0.14
 5320ddd8c3a60d00e0513f9f70d6846cd449409b 0.17.beta1
 275fb550c1d802da3df35ebae41e04eadc60e49e 0.17.2
+b0faba6967e74f652286a0de6d02d736845b0708 0.17.3
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -15,7 +15,7 @@ Other changes
 -------------
-0.17.3 (??)
+0.17.3 (2012-12-14)
 ===================
 Features added