tests/test-merge4.out
author Wagner Bruna <wbruna@softwareexpress.com.br>
Mon, 21 Jun 2010 16:59:38 -0300
branchstable
changeset 11427 4d03c3680400
parent 6336 4b0c9c674707
permissions -rw-r--r--
Merge i18n default into stable

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)