Merge.

2011-06-06 09:38:02 -05:00 · 2011-06-06 09:38:02 -05:00 · f9553372d2
parent 6b571c125b 0ac824c10b
commit f9553372d2
1 changed files with 1 additions and 1 deletions
--- a/.hgtags
+++ b/.hgtags
@ -1 +1 @@
-1e65977c40ccd1c27c83d48123208eaf9e6e550f rel_1_0
+0fd740c35d6cad47decbe9bab6b669d325fcefdc rel_1_0