merge 0.21.x branch into master

e4c340f8 · Stefan Behnel · 9bf3b15c · 760e7b24 · e4c340f8 · e4c340f8
Commit e4c340f8 authored Dec 27, 2014 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
@@ -52,3 +52,4 @@ c1a18ab6b0808e87f68d2f9d914c01934510aef5 0.18b1
 58fc9a3feb83f571623a492256885d21945decb4 0.21.1
 58fc9a3feb83f571623a492256885d21945decb4 0.21.1
 d05a4acd45fca9bdc12cef82890ca569fbaae1a5 0.21.1
+ab1a3afb8775a09d37c0d478476987eee8e734a6 0.21.2
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -34,7 +34,7 @@ Other changes
 -------------


-0.21.2 (2014-12-??)
+0.21.2 (2014-12-27)
 ===================

 Bugs fixed