merge with 3.3

b1376b51 · Georg Brandl · 65078141 · 5e572fd4 · b1376b51
Commit b1376b51 authored Mar 09, 2014 by Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

.hgtags .hgtags +2 -0

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -121,6 +121,8 @@ c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
 fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
 7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
 9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1
+ca5635efe090f78806188ac2758f9948596aa8b2 v3.3.5rc2
+62cf4e77f78564714e7ea3d4bf1479ca1fbd0758 v3.3.5
 46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
 9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
 dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3