commit 049208635d4bb55f757de7f599f73902748c8257
author Benjamin Peterson <benjamin@python.org> Fri Apr 06 13:20:25 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Fri Apr 06 13:20:25 2012 -0400
tree bf7cf4462061474ec00a8f5c9305514ed3fba383
parent 161aece9d3574c22d2585687db5cd4f33a76f052
parent d62cd5627fc5c01571c018b8a11b152614862eff

merge heads

.hgtags

diff --git a/.hgtags b/.hgtags
index 35428d6..8ab75a8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -78,6 +78,8 @@
 32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1
 c918ec9f3a76d6afedfbb5d455004de880443a3d v3.1.4
 ee26aca3219cf4bb0b93352e83edcc9cb28c7802 v3.1.5rc1
+75db2bc69fc9a3e4801e94e3e19801cb096208d8 v3.1.5rc2
+7395330e495ec3316862ca1f6ce0aaf7bdf6785b v3.1.5
 b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1
 56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2
 da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3