commit 9c53584ebdb45c27d4b9c7cb7235bc5bb77c610f
author Martin v. Löwis <martin@v.loewis.de> Sat May 28 14:13:32 2011 +0200
committer Martin v. Löwis <martin@v.loewis.de> Sat May 28 14:13:32 2011 +0200
tree 541ca4b97b51a319b04084d8875152bd9b31498a
parent 32140f8955d454ba9bc5b4dc56e2b612beb2a4ad
parent 228516c3f8a237c41b81b853bb64d1db72bc3103

Nearly null-merge 2.5.6

.hgtags

diff --git a/.hgtags b/.hgtags
index 2fd5ff6..0ba8a0c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -112,6 +112,8 @@
 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