diff mercurial/templatefilters.py @ 18731:c2d079387b2c

merge with stable
author Mads Kiilerich <madski@unity3d.com>
date Thu, 28 Feb 2013 14:51:59 +0100
parents 4e949b8e0930 a5d33446e46c
children 8eef5b93db9d
line wrap: on
line diff
--- a/mercurial/templatefilters.py	Sat Feb 23 22:54:57 2013 +0100
+++ b/mercurial/templatefilters.py	Thu Feb 28 14:51:59 2013 +0100
@@ -5,6 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
+from i18n import _
 import cgi, re, os, time, urllib
 import encoding, node, util, error
 import hbisect