diff mercurial/templater.py @ 16347:21b31e9c20f3

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Apr 2012 17:02:50 -0500
parents e2c413bde8a5
children 67964cda8701
line wrap: on
line diff