summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorsimon <none@none>2013-11-22 10:39:03 -0800
committersimon <none@none>2013-11-22 10:39:03 -0800
commitf1be57cd30489902e44d7843703a39987f379c69 (patch)
tree0a4fa748cac9d415fab6095194b6031383d38a85 /.hgtags
parenta7381f6e40388900dd956a54167a33266e82238c (diff)
parent787ccaf297e81291469aaf269f563d862fb150a3 (diff)
Merge server-release
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index d598ff1f62..85c17be67d 100755
--- a/.hgtags
+++ b/.hgtags
@@ -469,3 +469,4 @@ ae457ece77001767ae9613148c495e7b98cc0f4a 3.6.7-release
d40c66e410741de7e90b1ed6dac28dd8a2d7e1f6 3.6.8-release
70eda3721d36df3e00730629c42a1304e5bc65b8 3.6.9-release
5b54b36862ff8bc3b6935673c9d1c1f22ee8d521 3.6.10-release
+2feb70a4cfde43f2898d95ff8fcae3e67805c7c2 3.6.11-release