aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-11-16 12:50:45 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2010-11-16 12:50:45 -0500
commitd8bb3b9197e74a1cdaf9788ae631f77713490fde (patch)
tree5c02ed9cd9ea7c5c759b2f0e4573828f3178af74
parent73a9d804e07e442f5b065a1a27cf5eb5319edf7b (diff)
parentd0ff317ae39ec705eca8e9e0ad220321adfaf2d4 (diff)
downloadexternal_python_mako-d8bb3b9197e74a1cdaf9788ae631f77713490fde.tar.gz
external_python_mako-d8bb3b9197e74a1cdaf9788ae631f77713490fde.tar.bz2
external_python_mako-d8bb3b9197e74a1cdaf9788ae631f77713490fde.zip
merge tip
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 7ca3b90..bfea1b1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -21,3 +21,4 @@ e62bc10997e49697f21ea6eaacea34464893a877 rel_0_1_6
6efa09cec79f8ac79c3be054573f30904d439c74 rel_0_3_3
7c0d449fb0aa7cf4e178f9a6bf21fff9570b791e rel_0_3_4
3c97a5d3dbd317a6019e6ea5d046905ce358b93b rel_0_3_5
+26df51c4fc72a70e5e1420660d79b58fed06ccd6 rel_0_3_6