diff .hgtags @ 18743:70e2a22fd66e

merge with stable
author Kevin Bullock <kbullock@ringworld.org>
date Fri, 01 Mar 2013 10:05:37 -0600
parents 6f002b142f9b
children c9d1241ba11d
line wrap: on
line diff
--- a/.hgtags	Thu Feb 28 21:58:37 2013 -0600
+++ b/.hgtags	Fri Mar 01 10:05:37 2013 -0600
@@ -79,3 +79,4 @@
 f5fbe15ca7449f2c9a3cf817c86d0ae68b307214 2.5-rc
 a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 2.5
 7511d4df752e61fe7ae4f3682e0a0008573b0402 2.5.1
+5b7175377babacce80a6c1e12366d8032a6d4340 2.5.2