tests/test-merge4.out
author Jose M. Prieto <jmprieto@gmx.net>
Tue, 03 Oct 2006 12:33:18 +0200
changeset 3251 e5c9a084ffe3
parent 2175 b2ae81a7df29
permissions -rw-r--r--
util.strdate: assume local time when no timezone specified

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