merge 3.4 into default

cf7ec011 · Georg Brandl · bfd7881a · fa62f4ce · cf7ec011
Commit cf7ec011 authored Oct 12, 2014 by Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

.hgtags .hgtags +4 -0

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -102,6 +102,8 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
 b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1
 1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4
 cef745775b6583446572cffad704100983db2bea v3.2.5
+51382a5598ec96119cb84594572901c9c964dc3c v3.2.6rc1
+0bd5f4f14de965ca8e44c6e3965fee106176cfc4 v3.2.6
 f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
 2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2
 0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3
@@ -123,6 +125,8 @@ fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
 9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1
 ca5635efe090f78806188ac2758f9948596aa8b2 v3.3.5rc2
 62cf4e77f78564714e7ea3d4bf1479ca1fbd0758 v3.3.5
+51317c9786f54267975abf2e9c502e6aaaa4a249 v3.3.6rc1
+971fec30da1fc5bf2b9fb28e09812a5127014211 v3.3.6
 46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
 9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
 dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3