diff .hgtags @ 18535:7068089c95a2

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Feb 2013 15:48:33 -0600
parents 19df8a5b7618
children 34c021d8dff6
line wrap: on
line diff
--- a/.hgtags	Sat Jan 19 17:20:39 2013 -0600
+++ b/.hgtags	Fri Feb 01 15:48:33 2013 -0600
@@ -76,3 +76,5 @@
 195ad823b5d58c68903a6153a25e3fb4ed25239d 2.4
 0c10cf8191469e7c3c8844922e17e71a176cb7cb 2.4.1
 a4765077b65e6ae29ba42bab7834717b5072d5ba 2.4.2
+f5fbe15ca7449f2c9a3cf817c86d0ae68b307214 2.5-rc
+a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 2.5