diff tests/test-simplemerge.py @ 15974:cd4504d26695 stable

merge with i18n
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 23 Jan 2012 16:11:37 -0200
parents 7de7630053cb
children d08b333816c6
line wrap: on
line diff