diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2011-05-28 12:14:17 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2011-05-28 12:14:17 (GMT) |
| commit | 609e36d88747ddc6e86800648f6972c61a8abfec (patch) | |
| tree | 83dc49cad03b531a7e493ae09ff8c0a6c94b312b | |
| parent | 482f908410060eebed6c5cdadf967d4a0b22d114 (diff) | |
| parent | 9c53584ebdb45c27d4b9c7cb7235bc5bb77c610f (diff) | |
| download | cpython-609e36d88747ddc6e86800648f6972c61a8abfec.zip cpython-609e36d88747ddc6e86800648f6972c61a8abfec.tar.gz cpython-609e36d88747ddc6e86800648f6972c61a8abfec.tar.bz2 | |
Nearly null-merge 2.5.6
| -rw-r--r-- | .hgtags | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -112,6 +112,8 @@ a0a6d9909312ad9c1d844af66e9c91931b93852a v2.5.4 657f16582943739b906f66f7efad4014492c8b1c v2.5.5c1 1dc91e9dd5c13a4bc2d3bb7d4b5896ab264f2325 v2.5.5c2 7098a46f0b75e5aacfaf81d65d72e3613b023532 v2.5.5 +a87c7b96672b69dffef64c59b56fba5bb2059b99 v2.5.6c1 +de34c7b097e8d66b1140c211dbd61d48b31ba483 v2.5.6 2d0bd095c420b0711000d9be66848f6cfd972b3b v2.6a1 eec144917a189be11ed5efa35c6604d03bc62bcc v2.6a2 48e9fb0a721799877f26edaef01ac6e6029b6812 v2.6a3 |