tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 27 Sep 2006 20:34:52 +0200
changeset 3169 7492b33bdd9f
parent 2175 b2ae81a7df29
permissions -rw-r--r--
shortuser should stop before the first space character. Examples: "Foo Bar <foo.bar AT example DOT com>" -> "foo.bar" (instead of "foo.bar AT example DOT com>" as it was before.) "Foo Bar" -> "Foo"

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)