merge with i18n
authorMatt Mackall <mpm@selenic.com>
Mon, 20 Dec 2010 12:08:56 -0600
changeset 13171 b546db00cfd7
parent 13170 537df3bfbaad (current diff)
parent 13167 122f8a5e02db (diff)
child 13172 84cec5895d01
merge with i18n